Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc4.20230118gitc1649ec55708.33.vanilla.1.fc38

9 files changed, 25 insertions, 15 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 2c3816673..1c25bd071 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 = 31
+RHEL_RELEASE = 33
 
 #
 # ZSTREAM
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index e1baa029c..03af8b643 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -3774,7 +3774,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTK_T7XX=m
+# CONFIG_MTK_T7XX is not set
 CONFIG_MULTIPLEXER=m
 CONFIG_MUX_ADG792A=m
 # CONFIG_MUX_ADGS1408 is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 37b0b3a9f..e31dc5efa 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -3395,7 +3395,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTK_T7XX=m
+# CONFIG_MTK_T7XX is not set
 CONFIG_MULTIUSER=y
 # CONFIG_MVMDIO is not set
 # CONFIG_MV_XOR_V2 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index f7936b6f8..87a3a1b3a 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -3754,7 +3754,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTK_T7XX=m
+# CONFIG_MTK_T7XX is not set
 CONFIG_MULTIPLEXER=m
 CONFIG_MUX_ADG792A=m
 # CONFIG_MUX_ADGS1408 is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index b8d620202..b2bdc09d1 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -3375,7 +3375,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTK_T7XX=m
+# CONFIG_MTK_T7XX is not set
 CONFIG_MULTIUSER=y
 # CONFIG_MVMDIO is not set
 # CONFIG_MV_XOR_V2 is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 459ada5aa..995f865bc 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -3387,7 +3387,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTK_T7XX=m
+# CONFIG_MTK_T7XX is not set
 CONFIG_MULTIUSER=y
 # CONFIG_MVMDIO is not set
 # CONFIG_MV_XOR_V2 is not set
diff --git a/kernel.spec b/kernel.spec
index f2cc806a3..3912c71be 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -126,17 +126,17 @@ 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
 # define buildid .local
 %define specversion 6.2.0
 %define patchversion 6.2
-%define pkgrelease 0.rc4.31
+%define pkgrelease 0.rc4.20230118gitc1649ec55708.33
 %define kversion 6
-%define tarfile_release 6.2-rc4
+%define tarfile_release 6.2-rc4-41-gc1649ec55708
 # This is needed to do merge window version magic
 %define patchlevel 2
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.31%{?buildid}%{?dist}
+%define specrelease 0.rc4.20230118gitc1649ec55708.33%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.2.0
 
@@ -3188,9 +3188,19 @@ fi
 #
 #
 %changelog
-* Mon Jan 16 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.31]
+* Wed Jan 18 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.c1649ec55708.33]
+- Turn off CONFIG_MTK_T7XX for S390x (Justin M. Forbes)
 - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
 
+* Wed Jan 18 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.c1649ec55708.32]
+- Fix up configs with SND_SOC_NAU8315 mismatch (Justin M. Forbes)
+- Linux v6.2.0-0.rc4.c1649ec55708
+
+* Tue Jan 17 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.6e50979a9c87.31]
+- CI: Do a full build for non-bot runs (Veronika Kabatova)
+- Fix up configs with SND_SOC_NAU8315 mismatch (Justin M. Forbes)
+- Linux v6.2.0-0.rc4.6e50979a9c87
+
 * Mon Jan 16 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc4.30]
 - Linux v6.2.0-0.rc4
 
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch
index 6de6ae048..fa19ab9fd 100644
--- a/patch-6.2-redhat.patch
+++ b/patch-6.2-redhat.patch
@@ -2533,7 +2533,7 @@ index 5b67f208f7de..060133d19a4b 100644
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/init/Kconfig b/init/Kconfig
-index 0958846b005e..a9f8a5e4f3d8 100644
+index 7ceabd320425..a31242963c10 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
 @@ -1698,7 +1698,7 @@ config AIO
diff --git a/sources b/sources
index 46ffa0ba0..4fc1edea4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.2-rc4.tar.xz) = 93ca7c05cba7e58f0b1b6d01b456dfe886c0983fb595ec0cfe2053812ca50bd06827e3abd1d27b13efdc0332e4b3f56097a1e02458907154f77d9a4a738e316c
-SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = aa5fa056d61693425f10a12ff4972b9e54e0830473e410316d6dc71cd6379c7c24dc8ef9383e9c4ac7dfd50eb72091c50fe5ed7821f082d40751ce4609631764
-SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 26eb6ba82fefd323efef409627c0413d6275fdc174ad1fa4bfd31e1bc61a10c03182a0cefd5ebb41df87feb04af5b7759a5eb23cc81943fbd341018d3dcd21d2
+SHA512 (linux-6.2-rc4-41-gc1649ec55708.tar.xz) = bc7a4c0db5eb915d983cb05b8ef792acdba2060778bd05b37d2f9633daac85ffcf7d20e6bf230bd5a15da0bb32e4c6e09eba8130c7b89e65598868f5de8b9fc8
+SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = f36727e16766954863c80272ca2713c1c9aa8f37d1a3bdd06dc36280e548cd9ee163eb663fccd39d2e388c68c60f42c905fe913671b18f6e01dd24d5c0c0b6b5
+SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = a2ae4aa3fcf5f7f888399bde635a229df92dafe60b8ad010c7446f39ecfe703518f5d2d179abe8fcfd1687bc3724ef4808676c174a4eea575f55698e70a06d81