diff --git a/.gitignore b/.gitignore
index 5132dfa..ab55edc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*.bz2
*.x509
*.rpm
+*.orig
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 70395c4..7004b35 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 1
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 71
+RHEL_RELEASE = 72
#
# Early y+1 numbering
diff --git a/Module.kabi_aarch64 b/Module.kabi_aarch64
index d32379e..e69de29 100644
--- a/Module.kabi_aarch64
+++ b/Module.kabi_aarch64
@@ -1,29 +0,0 @@
-0x63c4d61f __bitmap_weight vmlinux EXPORT_SYMBOL
-0x68f31cbd __list_add_valid vmlinux EXPORT_SYMBOL
-0x6b2dc060 dump_stack vmlinux EXPORT_SYMBOL
-0x3854774b kstrtoll vmlinux EXPORT_SYMBOL
-0x449ad0a7 memcmp vmlinux EXPORT_SYMBOL
-0x4829a47e memcpy vmlinux EXPORT_SYMBOL
-0x5a9f1d63 memmove vmlinux EXPORT_SYMBOL
-0x27864d57 memparse vmlinux EXPORT_SYMBOL
-0xdcb764ad memset vmlinux EXPORT_SYMBOL
-0x0b742fd7 simple_strtol vmlinux EXPORT_SYMBOL
-0x61b7b126 simple_strtoull vmlinux EXPORT_SYMBOL
-0x656e4a6e snprintf vmlinux EXPORT_SYMBOL
-0x3c3ff9fd sprintf vmlinux EXPORT_SYMBOL
-0xbcab6ee6 sscanf vmlinux EXPORT_SYMBOL
-0x349cba85 strchr vmlinux EXPORT_SYMBOL
-0xe2d5255a strcmp vmlinux EXPORT_SYMBOL
-0xe914e41e strcpy vmlinux EXPORT_SYMBOL
-0xf9c0b663 strlcat vmlinux EXPORT_SYMBOL
-0x5792f848 strlcpy vmlinux EXPORT_SYMBOL
-0x98cf60b3 strlen vmlinux EXPORT_SYMBOL
-0x5a921311 strncmp vmlinux EXPORT_SYMBOL
-0x9166fada strncpy vmlinux EXPORT_SYMBOL
-0x24428be5 strncpy_from_user vmlinux EXPORT_SYMBOL
-0xa916b694 strnlen vmlinux EXPORT_SYMBOL
-0x9f984513 strrchr vmlinux EXPORT_SYMBOL
-0x85df9b6c strsep vmlinux EXPORT_SYMBOL
-0x1e6d26a8 strstr vmlinux EXPORT_SYMBOL
-0x9ea53d7f vsnprintf vmlinux EXPORT_SYMBOL
-0xac94e86b vsprintf vmlinux EXPORT_SYMBOL
diff --git a/Module.kabi_ppc64le b/Module.kabi_ppc64le
index 5b02d1b..e69de29 100644
--- a/Module.kabi_ppc64le
+++ b/Module.kabi_ppc64le
@@ -1,31 +0,0 @@
-0x63c4d61f __bitmap_weight vmlinux EXPORT_SYMBOL
-0x68f31cbd __list_add_valid vmlinux EXPORT_SYMBOL
-0x13c49cc2 _copy_from_user vmlinux EXPORT_SYMBOL
-0x6b10bee1 _copy_to_user vmlinux EXPORT_SYMBOL
-0x6b2dc060 dump_stack vmlinux EXPORT_SYMBOL
-0x3854774b kstrtoll vmlinux EXPORT_SYMBOL
-0x1c3e02e4 memcmp vmlinux EXPORT_SYMBOL
-0x4829a47e memcpy vmlinux EXPORT_SYMBOL
-0x5a9f1d63 memmove vmlinux EXPORT_SYMBOL
-0x27864d57 memparse vmlinux EXPORT_SYMBOL
-0xdcb764ad memset vmlinux EXPORT_SYMBOL
-0x0b742fd7 simple_strtol vmlinux EXPORT_SYMBOL
-0x61b7b126 simple_strtoull vmlinux EXPORT_SYMBOL
-0x656e4a6e snprintf vmlinux EXPORT_SYMBOL
-0x3c3ff9fd sprintf vmlinux EXPORT_SYMBOL
-0xbcab6ee6 sscanf vmlinux EXPORT_SYMBOL
-0x349cba85 strchr vmlinux EXPORT_SYMBOL
-0xe2d5255a strcmp vmlinux EXPORT_SYMBOL
-0xe914e41e strcpy vmlinux EXPORT_SYMBOL
-0xf9c0b663 strlcat vmlinux EXPORT_SYMBOL
-0x5792f848 strlcpy vmlinux EXPORT_SYMBOL
-0x98cf60b3 strlen vmlinux EXPORT_SYMBOL
-0x5a921311 strncmp vmlinux EXPORT_SYMBOL
-0x9166fada strncpy vmlinux EXPORT_SYMBOL
-0x24428be5 strncpy_from_user vmlinux EXPORT_SYMBOL
-0xa916b694 strnlen vmlinux EXPORT_SYMBOL
-0x9f984513 strrchr vmlinux EXPORT_SYMBOL
-0x85df9b6c strsep vmlinux EXPORT_SYMBOL
-0x1e6d26a8 strstr vmlinux EXPORT_SYMBOL
-0x9ea53d7f vsnprintf vmlinux EXPORT_SYMBOL
-0xac94e86b vsprintf vmlinux EXPORT_SYMBOL
diff --git a/Module.kabi_s390x b/Module.kabi_s390x
index de0f9a5..e69de29 100644
--- a/Module.kabi_s390x
+++ b/Module.kabi_s390x
@@ -1,28 +0,0 @@
-0x63c4d61f __bitmap_weight vmlinux EXPORT_SYMBOL
-0x68f31cbd __list_add_valid vmlinux EXPORT_SYMBOL
-0x6b2dc060 dump_stack vmlinux EXPORT_SYMBOL
-0x3854774b kstrtoll vmlinux EXPORT_SYMBOL
-0x2fa5a500 memcmp vmlinux EXPORT_SYMBOL
-0x236c8c64 memcpy vmlinux EXPORT_SYMBOL
-0xa3a5be95 memmove vmlinux EXPORT_SYMBOL
-0x27864d57 memparse vmlinux EXPORT_SYMBOL
-0xde0bdcff memset vmlinux EXPORT_SYMBOL
-0x0b742fd7 simple_strtol vmlinux EXPORT_SYMBOL
-0x61b7b126 simple_strtoull vmlinux EXPORT_SYMBOL
-0x98de1c15 snprintf vmlinux EXPORT_SYMBOL
-0x3c3ff9fd sprintf vmlinux EXPORT_SYMBOL
-0xbcab6ee6 sscanf vmlinux EXPORT_SYMBOL
-0x349cba85 strchr vmlinux EXPORT_SYMBOL
-0xe2d5255a strcmp vmlinux EXPORT_SYMBOL
-0xe914e41e strcpy vmlinux EXPORT_SYMBOL
-0x6d1ea6ec strlcat vmlinux EXPORT_SYMBOL
-0x672144bd strlcpy vmlinux EXPORT_SYMBOL
-0x25ec1b28 strlen vmlinux EXPORT_SYMBOL
-0x85abc85f strncmp vmlinux EXPORT_SYMBOL
-0xad4aee39 strncpy vmlinux EXPORT_SYMBOL
-0x9b8d07aa strnlen vmlinux EXPORT_SYMBOL
-0x9f984513 strrchr vmlinux EXPORT_SYMBOL
-0x85df9b6c strsep vmlinux EXPORT_SYMBOL
-0x1e6d26a8 strstr vmlinux EXPORT_SYMBOL
-0x9c0821ea vsnprintf vmlinux EXPORT_SYMBOL
-0xac94e86b vsprintf vmlinux EXPORT_SYMBOL
diff --git a/Module.kabi_x86_64 b/Module.kabi_x86_64
index 3507a82..e69de29 100644
--- a/Module.kabi_x86_64
+++ b/Module.kabi_x86_64
@@ -1,31 +0,0 @@
-0x63c4d61f __bitmap_weight vmlinux EXPORT_SYMBOL
-0x68f31cbd __list_add_valid vmlinux EXPORT_SYMBOL
-0x13c49cc2 _copy_from_user vmlinux EXPORT_SYMBOL
-0x6b10bee1 _copy_to_user vmlinux EXPORT_SYMBOL
-0x6b2dc060 dump_stack vmlinux EXPORT_SYMBOL
-0x3854774b kstrtoll vmlinux EXPORT_SYMBOL
-0x449ad0a7 memcmp vmlinux EXPORT_SYMBOL
-0x69acdf38 memcpy vmlinux EXPORT_SYMBOL
-0xb0e602eb memmove vmlinux EXPORT_SYMBOL
-0x27864d57 memparse vmlinux EXPORT_SYMBOL
-0xfb578fc5 memset vmlinux EXPORT_SYMBOL
-0x0b742fd7 simple_strtol vmlinux EXPORT_SYMBOL
-0x61b7b126 simple_strtoull vmlinux EXPORT_SYMBOL
-0x656e4a6e snprintf vmlinux EXPORT_SYMBOL
-0x3c3ff9fd sprintf vmlinux EXPORT_SYMBOL
-0xbcab6ee6 sscanf vmlinux EXPORT_SYMBOL
-0x349cba85 strchr vmlinux EXPORT_SYMBOL
-0xe2d5255a strcmp vmlinux EXPORT_SYMBOL
-0xe914e41e strcpy vmlinux EXPORT_SYMBOL
-0xf9c0b663 strlcat vmlinux EXPORT_SYMBOL
-0x5792f848 strlcpy vmlinux EXPORT_SYMBOL
-0x754d539c strlen vmlinux EXPORT_SYMBOL
-0x5a921311 strncmp vmlinux EXPORT_SYMBOL
-0x9166fada strncpy vmlinux EXPORT_SYMBOL
-0x8522d6bc strncpy_from_user vmlinux EXPORT_SYMBOL
-0xa916b694 strnlen vmlinux EXPORT_SYMBOL
-0x9f984513 strrchr vmlinux EXPORT_SYMBOL
-0x85df9b6c strsep vmlinux EXPORT_SYMBOL
-0x1e6d26a8 strstr vmlinux EXPORT_SYMBOL
-0x9ea53d7f vsnprintf vmlinux EXPORT_SYMBOL
-0xac94e86b vsprintf vmlinux EXPORT_SYMBOL
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 4b6d3e0..17eda14 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2723,6 +2723,7 @@
# CONFIG_SURFACE_3_POWER_OPREGION is not set
# CONFIG_SURFACE_GPE is not set
# CONFIG_SURFACE_HOTPLUG is not set
+# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -4372,7 +4373,6 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEL_IDXD=m
-CONFIG_INTEL_PCH_THERMAL=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
@@ -5863,7 +5863,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_PLATFORMS=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SYMBOLIC_ERRNAME=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index e09ebd5..7fd030d 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2805,6 +2805,7 @@
# CONFIG_SURFACE_3_POWER_OPREGION is not set
# CONFIG_SURFACE_GPE is not set
# CONFIG_SURFACE_HOTPLUG is not set
+# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -4396,7 +4397,6 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEL_IDXD=m
-CONFIG_INTEL_PCH_THERMAL=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
@@ -5846,7 +5846,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_PLATFORMS=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SYMBOLIC_ERRNAME=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 9e7be4b..c428c1d 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -2562,6 +2562,7 @@
# CONFIG_SURFACE_3_POWER_OPREGION is not set
# CONFIG_SURFACE_GPE is not set
# CONFIG_SURFACE_HOTPLUG is not set
+# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -4081,7 +4082,6 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEL_IDXD=m
-CONFIG_INTEL_PCH_THERMAL=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
@@ -5631,7 +5631,6 @@ CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUN_PARTITION=y
-CONFIG_SURFACE_PLATFORMS=y
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
CONFIG_SWAP=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index dc48e4e..9225232 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -2643,6 +2643,7 @@
# CONFIG_SURFACE_3_POWER_OPREGION is not set
# CONFIG_SURFACE_GPE is not set
# CONFIG_SURFACE_HOTPLUG is not set
+# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -4104,7 +4105,6 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEL_IDXD=m
-CONFIG_INTEL_PCH_THERMAL=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
@@ -5617,7 +5617,6 @@ CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUN_PARTITION=y
-CONFIG_SURFACE_PLATFORMS=y
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
CONFIG_SWAP=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 8187b5f..a93b902 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2706,6 +2706,7 @@
# CONFIG_SURFACE_3_POWER_OPREGION is not set
# CONFIG_SURFACE_GPE is not set
# CONFIG_SURFACE_HOTPLUG is not set
+# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -4188,7 +4189,6 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEL_IDXD=m
-CONFIG_INTEL_PCH_THERMAL=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
@@ -5606,7 +5606,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_PLATFORMS=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SYMBOLIC_ERRNAME=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 43f0d62..06b32cc 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2786,6 +2786,7 @@
# CONFIG_SURFACE_3_POWER_OPREGION is not set
# CONFIG_SURFACE_GPE is not set
# CONFIG_SURFACE_HOTPLUG is not set
+# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -4211,7 +4212,6 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEL_IDXD=m
-CONFIG_INTEL_PCH_THERMAL=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
@@ -5593,7 +5593,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_PLATFORMS=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SYMBOLIC_ERRNAME=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index f3966f5..effc5b7 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2933,6 +2933,7 @@
# CONFIG_SURFACE_3_POWER_OPREGION is not set
# CONFIG_SURFACE_GPE is not set
# CONFIG_SURFACE_HOTPLUG is not set
+# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
# CONFIG_SWAP is not set
# CONFIG_SW_SYNC is not set
@@ -4329,7 +4330,6 @@ CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_AUDIT=y
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEL_IDXD=m
-CONFIG_INTEL_PCH_THERMAL=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
@@ -5646,7 +5646,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_PLATFORMS=y
CONFIG_SUSPEND=y
CONFIG_SYMBOLIC_ERRNAME=y
CONFIG_SYNC_FILE=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 27967fc..54d7a8d 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -984,7 +984,6 @@
# CONFIG_INTEL_MEI_HDCP is not set
# CONFIG_INTEL_MEI_TXE is not set
# CONFIG_INTEL_MENLOW is not set
-# CONFIG_INTEL_PCH_THERMAL is not set
# CONFIG_INTEL_PUNIT_IPC is not set
# CONFIG_INTEL_SCU_PCI is not set
# CONFIG_INTEL_SCU_PLATFORM is not set
@@ -2373,6 +2372,7 @@
# CONFIG_SURFACE_3_POWER_OPREGION is not set
# CONFIG_SURFACE_GPE is not set
# CONFIG_SURFACE_HOTPLUG is not set
+# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -4081,6 +4081,7 @@ CONFIG_INTEL_MEI=m
CONFIG_INTEL_MEI_ME=m
CONFIG_INTEL_MEI_WDT=m
CONFIG_INTEL_OAKTRAIL=m
+CONFIG_INTEL_PCH_THERMAL=m
CONFIG_INTEL_PMC_CORE=m
CONFIG_INTEL_PMT_CLASS=m
CONFIG_INTEL_PMT_CRASHLOG=m
@@ -5823,7 +5824,6 @@ CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUN_PARTITION=y
-CONFIG_SURFACE_PLATFORMS=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 3934f34..2bdba3d 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1031,7 +1031,6 @@
# CONFIG_INTEL_MEI_HDCP is not set
# CONFIG_INTEL_MEI_TXE is not set
# CONFIG_INTEL_MENLOW is not set
-# CONFIG_INTEL_PCH_THERMAL is not set
# CONFIG_INTEL_PUNIT_IPC is not set
# CONFIG_INTEL_SCU_PCI is not set
# CONFIG_INTEL_SCU_PLATFORM is not set
@@ -2451,6 +2450,7 @@
# CONFIG_SURFACE_3_POWER_OPREGION is not set
# CONFIG_SURFACE_GPE is not set
# CONFIG_SURFACE_HOTPLUG is not set
+# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
@@ -4104,6 +4104,7 @@ CONFIG_INTEL_MEI=m
CONFIG_INTEL_MEI_ME=m
CONFIG_INTEL_MEI_WDT=m
CONFIG_INTEL_OAKTRAIL=m
+CONFIG_INTEL_PCH_THERMAL=m
CONFIG_INTEL_PMC_CORE=m
CONFIG_INTEL_PMT_CLASS=m
CONFIG_INTEL_PMT_CRASHLOG=m
@@ -5808,7 +5809,6 @@ CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUN_PARTITION=y
-CONFIG_SURFACE_PLATFORMS=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
diff --git a/kernel.spec b/kernel.spec
index 4278f41..eb6263f 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 71
+%global distro_build 72
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -131,13 +131,13 @@ Summary: The Linux kernel
%define kversion 5.14
%define rpmversion 5.14.0
-%define pkgrelease 71.hs1.el9
+%define pkgrelease 72.hs1.el9
# This is needed to do merge window version magic
%define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 71.hs1%{?buildid}%{?dist}
+%define specrelease 72.hs1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -686,7 +686,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14.0-71.hs1.el9.tar.xz
+Source0: linux-5.14.0-72.hs1.el9.tar.xz
Source1: Makefile.rhelver
@@ -748,6 +748,8 @@ Source37: filter-aarch64.sh.rhel
Source38: filter-ppc64le.sh.rhel
Source39: filter-s390x.sh.rhel
Source40: filter-modules.sh.rhel
+
+Source41: x509.genkey.centos
%endif
%if 0%{?include_fedora}
@@ -847,7 +849,8 @@ Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
Requires(pre): %{initrd_prereq}\
-Requires(pre): linux-firmware >= 20150904-56.git6ebf5d57\
+Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
+Recommends: linux-firmware\
Requires(preun): systemd >= 200\
Conflicts: xfsprogs < 4.3.0-1\
Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
@@ -1353,8 +1356,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.14.0-71.hs1.el9 -c
-mv linux-5.14.0-71.hs1.el9 linux-%{KVERREL}
+%setup -q -n kernel-5.14.0-72.hs1.el9 -c
+mv linux-5.14.0-72.hs1.el9 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -1468,6 +1471,18 @@ done
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
+# We may want to override files from the primary target in case of building
+# against a flavour of it (eg. centos not rhel), thus override it here if
+# necessary
+if [ "%{primary_target}" == "rhel" ]; then
+%if 0%{?centos}
+ echo "Updating scripts/sources to centos version"
+ RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh centos
+%else
+ echo "Not updating scripts/sources to centos version"
+%endif
+fi
+
# end of kernel config
%endif
@@ -2224,6 +2239,14 @@ popd
# in the source tree. We installed them previously to $RPM_BUILD_ROOT/usr
# but there's no way to tell the Makefile to take them from there.
%{make} %{?_smp_mflags} headers_install
+
+# If we re building only tools without kernel, we need to generate config
+# headers and prepare tree for modules building. The modules_prepare target
+# will cover both.
+if [ ! -f include/generated/autoconf.h ]; then
+ %{make} %{?_smp_mflags} modules_prepare
+fi
+
%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/
# Prevent bpf selftests to build bpftool repeatedly:
@@ -2953,7 +2976,7 @@ fi
#
#
%changelog
-* Fri Mar 11 2022 Neal Gompa <ngompa@centosproject.org> [5.14.0-71.hs1.el9]
+* Wed Mar 16 2022 Neal Gompa <ngompa@centosproject.org> [5.14.0-72.hs1.el9]
- tools headers UAPI: Sync powerpc syscall table file changed by new futex_waitv syscall (Joel Savitz) [2038794]
- tools headers UAPI: Sync s390 syscall table file changed by new futex_waitv syscall (Joel Savitz) [2038794]
- futex: Wireup futex_waitv syscall (Joel Savitz) [2038794]
@@ -3002,6 +3025,10 @@ fi
- redhat: Fix "make dist-release-finish" to use the correct NVR variables (Neal Gompa) [2053836]
- redhat/configs: Enable the Btrfs file system (Neal Gompa)
+* Tue Mar 15 2022 Patrick Talbert <ptalbert@redhat.com> [5.14.0-72.el9]
+- spec: Fix separate tools build (Jiri Olsa) [2054579]
+- redhat: use centos x509.genkey file if building under centos (Herton R. Krzesinski) [2029952]
+
* Tue Mar 08 2022 Patrick Talbert <ptalbert@redhat.com> [5.14.0-71.el9]
- CI: Build coverage RPMs on c9s environment (Veronika Kabatova)
- md: use default_groups in kobj_type (Nigel Croxon) [2042797]
@@ -3029,6 +3056,14 @@ fi
- md: add error handling support for add_disk() (Nigel Croxon) [2042797]
- redhat: Bump RHEL_MINOR for 9.1 (Patrick Talbert)
+* Tue Mar 08 2022 Herton R. Krzesinski <herton@redhat.com> [5.14.0-70.1.1.el9_0]
+- Revert 8dffe2b6 "Merge: kabi: add lib ACKed symbols" (Čestmír Kalina) [2059972]
+- include/linux/kernel.h: fix function name for mark_hardware_unmaintained() if !CONFIG_RHEL_DIFFERENCES (Ewan D. Milne) [2059687]
+- scsi: sd: Mark ZBC host-managed SCSI disks as unmaintained (Ewan D. Milne) [2059687]
+- spec: make linux-firmware weak(er) dependency (Jan Stancek) [2031113]
+- redhat/configs: Enable CONFIG_INTEL_PCH_THERMAL for x86 (David Arcari) [2058186]
+- redhat/configs: Disable CONFIG_SURFACE_PLATFORMS (David Arcari) [2056609]
+
* Thu Feb 24 2022 Herton R. Krzesinski <herton@redhat.com> [5.14.0-70.el9]
- stmmac/intel: mark driver as tech preview (Mark Salter) [2045594]
- net: stmmac: Add GFP_DMA32 for rx buffers if no 64 capability (Mark Salter) [2045594]
diff --git a/sources b/sources
index a9c3cae..adc538d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (kernel-abi-stablelists-5.14.0-71.tar.bz2) = fb85f367d97a4a5fe45d8da6e7f959444b5edb1e7110e6fc0786bd226e100e62bfeb71c98305a54fb08bcfd1664b1cdca5e48187b5eddf2ad6d02b3b50aa752a
-SHA512 (kernel-kabi-dw-5.14.0-71.tar.bz2) = 322d2966b8e912599eb9ebd1a806435d770b2c979a421ffee9ebb93e1e4f6470ee8d5197f9c055818a999557c3e2159a3db460315019a4a1e3f26afbf011e597
-SHA512 (linux-5.14.0-71.hs1.el9.tar.xz) = 05010d976727cff672cba170beab91af5b440cb7a6eef349eb2561959fc894a54f163b4701eae26ccd8c87d394f0f2ebc18b6fe849bcd71f185e663676111501
+SHA512 (kernel-abi-stablelists-5.14.0-72.tar.bz2) = 622988abc60a399d01eca790061b5b46c061975ff8e66cd9b7a08c1555cec0deb653a886c1c37a96ba78e7010873d987089c7986f88ebf9ea5c30d3f88311170
+SHA512 (kernel-kabi-dw-5.14.0-72.tar.bz2) = 322d2966b8e912599eb9ebd1a806435d770b2c979a421ffee9ebb93e1e4f6470ee8d5197f9c055818a999557c3e2159a3db460315019a4a1e3f26afbf011e597
+SHA512 (linux-5.14.0-72.hs1.el9.tar.xz) = 41c4670761438cc1d484cc6ef6e0019afd51aa4f1742f536e5c3f32d06e1bd36f6036012f30aa61affeb846870266ee7699c06f0d62d529181ef11a2b2c5eeb0
SHA512 (rheldup3.x509) = ebf56d821acb5c17bb1842a8ddc8f1014a9e112ef7569531eedbabc82c6b5740e2709f96c5ebc87ba837e8085d0b090a9e63ddd06507692b41dae54a2b48d21b
SHA512 (rhelkpatch1.x509) = 2dac65723dca562dabdf503f44fb70052e6fb3569d257f6f59d13275408a91b400ced1f42b37bac29bf5d73c3c3a4f96c7819832d0cbe85134a989cbbf863d7b
diff --git a/x509.genkey.centos b/x509.genkey.centos
new file mode 100644
index 0000000..c91af3b
--- /dev/null
+++ b/x509.genkey.centos
@@ -0,0 +1,16 @@
+[ req ]
+default_bits = 3072
+distinguished_name = req_distinguished_name
+prompt = no
+x509_extensions = myexts
+
+[ req_distinguished_name ]
+O = The CentOS Project
+CN = CentOS Stream kernel signing key
+emailAddress = security@centos.org
+
+[ myexts ]
+basicConstraints=critical,CA:FALSE
+keyUsage=digitalSignature
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid