Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc5.20220224git23d04328444a.105.vanilla.1.fc37kernel-5.17.0-0.rc5.20220224git23d04328444a.105.vanilla.1.fc36kernel-5.17.0-0.rc5.20220224git23d04328444a.105.vanilla.1.fc35kernel-5.17.0-0.rc5.20220224git23d04328444a.105.vanilla.1.fc34

5 files changed, 21 insertions, 16 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index ab18d4bd0..94c1d96cc 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 = 104
+RHEL_RELEASE = 105
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 2650913ae..78c5693c8 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/add2fc220921353efa7cd5d483acbf47406a5673
- add2fc220921353efa7cd5d483acbf47406a5673 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
+https://gitlab.com/cki-project/kernel-ark/-/commit/24141b7116c374bcda3a1d1cb0f6bb5c8923b717
+ 24141b7116c374bcda3a1d1cb0f6bb5c8923b717 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.spec b/kernel.spec
index 16189e625..0bcb36874 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 0.rc5.20220223git5c1ee569660d.104
+%global distro_build 0.rc5.20220224git23d04328444a.105
 
 %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.20220223git5c1ee569660d.104
+%define pkgrelease 0.rc5.20220224git23d04328444a.105
 
 # This is needed to do merge window version magic
 %define patchlevel 17
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20220223git5c1ee569660d.104%{?buildid}%{?dist}
+%define specrelease 0.rc5.20220224git23d04328444a.105%{?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-11-g5c1ee569660d.tar.xz
+Source0: linux-5.17-rc5-21-g23d04328444a.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1393,8 +1393,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.17-rc5-11-g5c1ee569660d -c
-mv linux-5.17-rc5-11-g5c1ee569660d linux-%{KVERREL}
+%setup -q -n kernel-5.17-rc5-21-g23d04328444a -c
+mv linux-5.17-rc5-21-g23d04328444a linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -3011,9 +3011,12 @@ fi
 #
 #
 %changelog
-* Wed Feb 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.5c1ee569660d.104]
+* Thu Feb 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.23d04328444a.105]
 - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
 
+* Thu Feb 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.23d04328444a.104]
+- configs/process_configs.sh: Remove orig files (Prarit Bhargava)
+
 * Wed Feb 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.5c1ee569660d.103]
 - redhat: configs: Disable CONFIG_MPLS for s390x/zfcpdump (Guillaume Nault)
 - Fedora 5.17 configs round 1 (Justin M. Forbes)
diff --git a/process_configs.sh b/process_configs.sh
index 8c997a5fa..312449fe1 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -226,15 +226,17 @@ function process_configs()
 	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
 	do
 		arch=$(head -1 "$cfg" | cut -b 3-)
-		cfgtmp="${cfg}.tmp"
-		cfgorig="${cfg}.orig"
-		cat "$cfg" > "$cfgorig"
 
 		if [ "$arch" = "EMPTY" ]
 		then
 			# This arch is intentionally left blank
 			continue
 		fi
+
+		cfgtmp="${cfg}.tmp"
+		cfgorig="${cfg}.orig"
+		cat "$cfg" > "$cfgorig"
+
 		echo -n "Processing $cfg ... "
 
 		make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
diff --git a/sources b/sources
index f0eea8b6d..94186eceb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc5-11-g5c1ee569660d.tar.xz) = 2f2e6a8b1219a297972a1844da9ab5677cbadc4a48103bc886afc3cf145dd86522e0a08badef219a02c2f70c3825c599365a1e5c068e24e170307f05ec704ddd
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc5.20220223git5c1ee569660d.104.tar.bz2) = 2f3b2a537f13a14e5934411f23540cd44216b72d24b5bc21fd9101fdac631732e2bf3ee9e9570e6612002f622140c86a5cf6d0066f49dc90befd0d8835ada268
-SHA512 (kernel-kabi-dw-5.17.0-0.rc5.20220223git5c1ee569660d.104.tar.bz2) = 89f9780d5f29bed487e39f72c00d071942437e4b1ffa43e52fd84c68dc508fcffce991b3fbba3569af3261f4ba170236e4957cc6cad0d2193edbfd589820aafd
+SHA512 (linux-5.17-rc5-21-g23d04328444a.tar.xz) = f17c0bb7b864777d27dc42ff79fcf69d0ff65d23fa61de071c895545edb9b92bc9d966bfa81e60ef2e2e1854dcf1875222c4d47215f170e93c406c6595bbc934
+SHA512 (kernel-abi-stablelists-5.17.0-0.rc5.20220224git23d04328444a.105.tar.bz2) = 7ab34b255c56a9a6346525732f93e4fce929758a8b005e155be12a06219165ac8ba5a7b26389621a0669afb9c33c8643fa51c4e5d2cc5f02bd084a9d44646f38
+SHA512 (kernel-kabi-dw-5.17.0-0.rc5.20220224git23d04328444a.105.tar.bz2) = 6f5faccfd415e0e9bfee6a71c16f9a8280741ec8ca2cbbfb9f2026ac99ad5d69017e24a76b57482d4073937a5b00106a3d5ffe473e1cf87c24bad02c0a1d4f9a