Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc3.20220211gitf1baf68e1383.93.vanilla.1.fc37kernel-5.17.0-0.rc3.20220211gitf1baf68e1383.93.vanilla.1.fc36kernel-5.17.0-0.rc3.20220211gitf1baf68e1383.93.vanilla.1.fc35kernel-5.17.0-0.rc3.20220211gitf1baf68e1383.93.vanilla.1.fc34

13 files changed, 38 insertions, 35 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 715f978e9..ee27c666c 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 = 92
+RHEL_RELEASE = 93
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 037042e3e..8b3d6b13b 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,8 +1,8 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/f2e9a5dcb98ca92feebf41be9205d77afe524c29
- f2e9a5dcb98ca92feebf41be9205d77afe524c29 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
+https://gitlab.com/cki-project/kernel-ark/-/commit/ada21bfdf0080a6e722fa7728977bbe99d72e2cf
+ ada21bfdf0080a6e722fa7728977bbe99d72e2cf mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
 
-https://gitlab.com/cki-project/kernel-ark/-/commit/43fe05955597db8314e24da463f82e185a26825c
- 43fe05955597db8314e24da463f82e185a26825c Workaround for gcc12 compile issues in ubcmd-util.h
+https://gitlab.com/cki-project/kernel-ark/-/commit/96157c95f4773cd7788f4173ca497a2309ff86d7
+ 96157c95f4773cd7788f4173ca497a2309ff86d7 Workaround for gcc12 compile issues in ubcmd-util.h
 
 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 11868cd77..5c804545e 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -700,7 +700,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
-CONFIG_CARDBUS=y
+# CONFIG_CARDBUS is not set
 # CONFIG_CARL9170 is not set
 CONFIG_CAVIUM_CPT=m
 CONFIG_CAVIUM_ERRATUM_22375=y
@@ -4483,7 +4483,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_QCOM_AOSS is not set
 # CONFIG_RESET_QCOM_PDC is not set
-CONFIG_RESET_SCMI=y
+# CONFIG_RESET_SCMI is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
@@ -6851,7 +6851,7 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
 # CONFIG_YAMAHA_YAS530 is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_YENTA=m
+# CONFIG_YENTA is not set
 # CONFIG_YOGABOOK_WMI is not set
 # CONFIG_Z3FOLD is not set
 CONFIG_ZBUD=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 59c2e7ff1..cafe75f72 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -700,7 +700,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
-CONFIG_CARDBUS=y
+# CONFIG_CARDBUS is not set
 # CONFIG_CARL9170 is not set
 CONFIG_CAVIUM_CPT=m
 CONFIG_CAVIUM_ERRATUM_22375=y
@@ -4460,7 +4460,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_QCOM_AOSS is not set
 # CONFIG_RESET_QCOM_PDC is not set
-CONFIG_RESET_SCMI=y
+# CONFIG_RESET_SCMI is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
@@ -6826,7 +6826,7 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
 # CONFIG_YAMAHA_YAS530 is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_YENTA=m
+# CONFIG_YENTA is not set
 # CONFIG_YOGABOOK_WMI is not set
 # CONFIG_Z3FOLD is not set
 CONFIG_ZBUD=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 4bd1c8538..57e1897c6 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -589,7 +589,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
-CONFIG_CARDBUS=y
+# CONFIG_CARDBUS is not set
 # CONFIG_CARL9170 is not set
 CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CB710_CORE=m
@@ -6608,7 +6608,7 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
 # CONFIG_YAMAHA_YAS530 is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_YENTA=m
+# CONFIG_YENTA is not set
 # CONFIG_YOGABOOK_WMI is not set
 # CONFIG_Z3FOLD is not set
 CONFIG_ZBUD=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index a0688c3a4..59b92e492 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -589,7 +589,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
-CONFIG_CARDBUS=y
+# CONFIG_CARDBUS is not set
 # CONFIG_CARL9170 is not set
 CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CB710_CORE=m
@@ -6587,7 +6587,7 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
 # CONFIG_YAMAHA_YAS530 is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_YENTA=m
+# CONFIG_YENTA is not set
 # CONFIG_YOGABOOK_WMI is not set
 # CONFIG_Z3FOLD is not set
 CONFIG_ZBUD=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index aa7da57d9..921f29a94 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -587,7 +587,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
-CONFIG_CARDBUS=y
+# CONFIG_CARDBUS is not set
 # CONFIG_CARL9170 is not set
 CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CB710_CORE=m
@@ -6561,7 +6561,7 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
 # CONFIG_YAMAHA_YAS530 is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_YENTA=m
+# CONFIG_YENTA is not set
 # CONFIG_YOGABOOK_WMI is not set
 # CONFIG_Z3FOLD is not set
 # CONFIG_ZBUD is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index e02f10a14..a36f2d72b 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -587,7 +587,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
-CONFIG_CARDBUS=y
+# CONFIG_CARDBUS is not set
 # CONFIG_CARL9170 is not set
 CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CB710_CORE=m
@@ -6540,7 +6540,7 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
 # CONFIG_YAMAHA_YAS530 is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_YENTA=m
+# CONFIG_YENTA is not set
 # CONFIG_YOGABOOK_WMI is not set
 # CONFIG_Z3FOLD is not set
 # CONFIG_ZBUD is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 7f00af2dd..0131aaefb 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -592,7 +592,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
-CONFIG_CARDBUS=y
+# CONFIG_CARDBUS is not set
 # CONFIG_CARL9170 is not set
 CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CB710_CORE=m
@@ -6569,7 +6569,7 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
 # CONFIG_YAMAHA_YAS530 is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_YENTA=m
+# CONFIG_YENTA is not set
 # CONFIG_YOGABOOK_WMI is not set
 # CONFIG_Z3FOLD is not set
 # CONFIG_ZBUD is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index bc21e6226..041f888cb 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -615,7 +615,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
-CONFIG_CARDBUS=y
+# CONFIG_CARDBUS is not set
 # CONFIG_CARL9170 is not set
 CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CB710_CORE=m
@@ -6869,7 +6869,7 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
 # CONFIG_YAMAHA_YAS530 is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_YENTA=m
+# CONFIG_YENTA is not set
 # CONFIG_YOGABOOK_WMI is not set
 # CONFIG_Z3FOLD is not set
 CONFIG_ZBUD=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 58706b50d..33c169aeb 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -615,7 +615,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
-CONFIG_CARDBUS=y
+# CONFIG_CARDBUS is not set
 # CONFIG_CARL9170 is not set
 CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CB710_CORE=m
@@ -6845,7 +6845,7 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
 # CONFIG_YAMAHA_YAS530 is not set
 # CONFIG_YELLOWFIN is not set
-CONFIG_YENTA=m
+# CONFIG_YENTA is not set
 # CONFIG_YOGABOOK_WMI is not set
 # CONFIG_Z3FOLD is not set
 CONFIG_ZBUD=y
diff --git a/kernel.spec b/kernel.spec
index 585bc0022..73f402ad3 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.rc3.20220210gitf4bc5bbb5fef.92
+%global distro_build 0.rc3.20220211gitf1baf68e1383.93
 
 %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.rc3.20220210gitf4bc5bbb5fef.92
+%define pkgrelease 0.rc3.20220211gitf1baf68e1383.93
 
 # This is needed to do merge window version magic
 %define patchlevel 17
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.20220210gitf4bc5bbb5fef.92%{?buildid}%{?dist}
+%define specrelease 0.rc3.20220211gitf1baf68e1383.93%{?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-rc3-43-gf4bc5bbb5fef.tar.xz
+Source0: linux-5.17-rc3-116-gf1baf68e1383.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1396,8 +1396,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.17-rc3-43-gf4bc5bbb5fef -c
-mv linux-5.17-rc3-43-gf4bc5bbb5fef linux-%{KVERREL}
+%setup -q -n kernel-5.17-rc3-116-gf1baf68e1383 -c
+mv linux-5.17-rc3-116-gf1baf68e1383 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -3018,10 +3018,13 @@ fi
 #
 #
 %changelog
-* Thu Feb 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc3.f4bc5bbb5fef.92]
+* Fri Feb 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc3.f1baf68e1383.93]
 - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
 - Workaround for gcc12 compile issues in ubcmd-util.h (Justin M. Forbes)
 
+* Fri Feb 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc3.f1baf68e1383.92]
+- Cleanup 'disabled' config options for RHEL (Prarit Bhargava)
+
 * Thu Feb 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc3.f4bc5bbb5fef.91]
 - redhat: move CONFIG_ARM64_MTE to aarch64 config directory (Herton R. Krzesinski)
 
diff --git a/sources b/sources
index 59fd9c44b..0685fbe3d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc3-43-gf4bc5bbb5fef.tar.xz) = ed05d79f109b35ba2117bf19713e1243034815e54847cc0134700fcff61e73a6978458e010195d2f976017f7eadd59f0371f01bd22df8de3cfda500dc5747aac
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.tar.bz2) = 20b37370afc469785d0d59d111e11edc1bc6d3c51f358dc6343fe452447e64d82e5959598faaa0461b1d69aca806253a7a7538b06ee58ffb22395dd3264dde1c
-SHA512 (kernel-kabi-dw-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.tar.bz2) = 345d85f4825a0f454fda218c3e24304dc94da5abbf55bea892163cca3670e9e4d325f4c37c2d0ab90fe31e84cd2e41ad700ecea53609083d90cc3e27aec1feef
+SHA512 (linux-5.17-rc3-116-gf1baf68e1383.tar.xz) = 97be5083b0cdc1e904a8e4f8deb267d22e2c3010f7295838ec2ec877f79335a7a1eaa7fa53fbfa448fc13c7a6afc67ea454a4f5b2a08ed207c1ef4275162051b
+SHA512 (kernel-abi-stablelists-5.17.0-0.rc3.20220211gitf1baf68e1383.93.tar.bz2) = ff7c846a237bd2e2a00af6d2cd7aa4d7e36ea00f6c39594553e9b0baf7feeead193dac459eb7aa5e7bcde8a6548d67d6e10d00268570275058b2ca8defad0cbd
+SHA512 (kernel-kabi-dw-5.17.0-0.rc3.20220211gitf1baf68e1383.93.tar.bz2) = cfc68b2457ccd7deec9c329dbe3f49d06f539e409ac410ee360efc86378663f38ea01f52a6a6928d29f4474c4b632f3fad737256b2fde3c19cb62b8688e0fdaa