Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc5.20220222git038101e6b2cd.103.vanilla.1.fc35

13 files changed, 26 insertions, 23 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 2f1ebf4e5..ed228d18f 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 102
+RHEL_RELEASE = 103
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 1f683b85c..b76d78dc4 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/a225ad3aaaf8a13ed474930bc3b204b396d978d2
- a225ad3aaaf8a13ed474930bc3b204b396d978d2 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
+https://gitlab.com/cki-project/kernel-ark/-/commit/b280d0e7c22863a57058c59369664d632bac8d48
+ b280d0e7c22863a57058c59369664d632bac8d48 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
 
 https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b
  4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index a10e8321c..a5a9ec703 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -5872,7 +5872,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 # CONFIG_SURFACE3_WMI is not set
 # CONFIG_SURFACE_GPE is not set
 # CONFIG_SURFACE_HOTPLUG is not set
-CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 62b3daea6..f321beaef 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -5847,7 +5847,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 # CONFIG_SURFACE3_WMI is not set
 # CONFIG_SURFACE_GPE is not set
 # CONFIG_SURFACE_HOTPLUG is not set
-CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index a6de43655..9ae545a0c 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -5636,7 +5636,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 # CONFIG_SURFACE3_WMI is not set
 # CONFIG_SURFACE_GPE is not set
 # CONFIG_SURFACE_HOTPLUG is not set
-CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 207070e3e..1aaf75497 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -5615,7 +5615,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 # CONFIG_SURFACE3_WMI is not set
 # CONFIG_SURFACE_GPE is not set
 # CONFIG_SURFACE_HOTPLUG is not set
-CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index c8355966e..dbfa996e5 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -5581,7 +5581,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 # CONFIG_SURFACE3_WMI is not set
 # CONFIG_SURFACE_GPE is not set
 # CONFIG_SURFACE_HOTPLUG is not set
-CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 255083100..debb6ba14 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -5560,7 +5560,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 # CONFIG_SURFACE3_WMI is not set
 # CONFIG_SURFACE_GPE is not set
 # CONFIG_SURFACE_HOTPLUG is not set
-CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 4d98bc5ae..271460d0b 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -5585,7 +5585,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 # CONFIG_SURFACE3_WMI is not set
 # CONFIG_SURFACE_GPE is not set
 # CONFIG_SURFACE_HOTPLUG is not set
-CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SUSPEND=y
 # CONFIG_SWAP is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index bf15e221b..61168f93d 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -5822,7 +5822,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 # CONFIG_SURFACE3_WMI is not set
 # CONFIG_SURFACE_GPE is not set
 # CONFIG_SURFACE_HOTPLUG is not set
-CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 908862f7e..31d7cf9bf 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -5798,7 +5798,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 # CONFIG_SURFACE3_WMI is not set
 # CONFIG_SURFACE_GPE is not set
 # CONFIG_SURFACE_HOTPLUG is not set
-CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
diff --git a/kernel.spec b/kernel.spec
index d14050200..9a7eca778 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,9 +85,9 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
-%global distro_build 0.rc5.102
+%global distro_build 0.rc5.20220222git038101e6b2cd.103
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -134,13 +134,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.17.0
 %define patchversion 5.17
-%define pkgrelease 0.rc5.102
+%define pkgrelease 0.rc5.20220222git038101e6b2cd.103
 
 # This is needed to do merge window version magic
 %define patchlevel 17
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.102%{?buildid}%{?dist}
+%define specrelease 0.rc5.20220222git038101e6b2cd.103%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -697,7 +697,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-rc5.tar.xz
+Source0: linux-5.17-rc5-4-g038101e6b2cd.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1393,8 +1393,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.17-rc5 -c
-mv linux-5.17-rc5 linux-%{KVERREL}
+%setup -q -n kernel-5.17-rc5-4-g038101e6b2cd -c
+mv linux-5.17-rc5-4-g038101e6b2cd linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -3011,9 +3011,12 @@ fi
 #
 #
 %changelog
-* Mon Feb 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.102]
+* Tue Feb 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.038101e6b2cd.103]
 - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
 
+* Tue Feb 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.038101e6b2cd.102]
+- redhat: configs: disable the surface platform (David Arcari)
+
 * Fri Feb 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc4.9195e5e0adbb.99]
 - redhat: configs: Disable team driver (Hangbin Liu) [1945477]
 
diff --git a/sources b/sources
index 50080e305..17d061e9a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc5.tar.xz) = f452302a452b52ce8a5ff4a5fd03e18536c5b742ba307d59f496c291f68ce81e1215f500582b851a5343b253e08bc06cebe1ff68c87de190c6dc79c6eda21faa
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc5.102.tar.bz2) = 900263442814d4df7c2f4e5e57506c6177ee201fffa49a4b8d1f03b1b04c8cd1e27eccfc72e87146744538269865916e301338ac20927f10e16a8cb6d231a1a1
-SHA512 (kernel-kabi-dw-5.17.0-0.rc5.102.tar.bz2) = 63ee61c9390da45ec9aba1b1454902c2b675910d79caf50fd645754f27b0347f8457743febb0b0ff66ca6fc28ee1bdaa9171eb917d64be90b35a967356cf93ca
+SHA512 (linux-5.17-rc5-4-g038101e6b2cd.tar.xz) = f9cce8ec5591114e45486526f2b5c16f1c959c27e751e0172500d6683b7c05a23c3c7155a1b42c64dbfc4971ee54a8a5d185e55d013fd9bca282c3cc13d3754f
+SHA512 (kernel-abi-stablelists-5.17.0-0.rc5.20220222git038101e6b2cd.103.tar.bz2) = 0d7ac81fc8b567cd47fcb0a5d0556733969a2efa757bb5d99c43980be41d6c3ba1ffc91556139971e014b387c57caeefa15732af09515ca7057e8aa1a5529c0d
+SHA512 (kernel-kabi-dw-5.17.0-0.rc5.20220222git038101e6b2cd.103.tar.bz2) = 30ccfaaa6efaf4e3750929ce0050358ec8aff0f46725bd9145bd2ba399f2450a1a4e3e88470aa2449c735d7da961773b5b048421653f70a63aa96460826f2db6