kernel-6.0.0-0.rc5.20220914git3245cb65fd91.39

* Wed Sep 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc5.3245cb65fd91.39] - Fix up SND_CTL debug options (Justin M. Forbes) - Revert "Merge branch 'sort_configs' into 'os-build'" (Justin M. Forbes) - Linux v6.0.0-0.rc5.3245cb65fd91 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2022-09-14 15:15:50 +01:00 · 2022-09-14 15:15:50 +01:00 · d904a3aa38
commit d904a3aa38
parent 4233655758
15 changed files with 24 additions and 19 deletions
--- 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 = 38
+RHEL_RELEASE = 39

 #
 # ZSTREAM
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -6900,7 +6900,7 @@ CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
-# CONFIG_SND_CTL_DEBUG is not set
+CONFIG_SND_CTL_DEBUG=y
 CONFIG_SND_CTL_INPUT_VALIDATION=y
 CONFIG_SND_CTL_VALIDATION=y
 CONFIG_SND_CTXFI=m
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -6880,7 +6880,7 @@ CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
 # CONFIG_SND_CTL_DEBUG is not set
-CONFIG_SND_CTL_INPUT_VALIDATION=y
+# CONFIG_SND_CTL_INPUT_VALIDATION is not set
 # CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -6937,7 +6937,7 @@ CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
-# CONFIG_SND_CTL_DEBUG is not set
+CONFIG_SND_CTL_DEBUG=y
 CONFIG_SND_CTL_INPUT_VALIDATION=y
 CONFIG_SND_CTL_VALIDATION=y
 CONFIG_SND_CTXFI=m
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -6919,7 +6919,7 @@ CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
 # CONFIG_SND_CTL_DEBUG is not set
-CONFIG_SND_CTL_INPUT_VALIDATION=y
+# CONFIG_SND_CTL_INPUT_VALIDATION is not set
 # CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -6749,7 +6749,7 @@ CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
-# CONFIG_SND_CTL_DEBUG is not set
+CONFIG_SND_CTL_DEBUG=y
 CONFIG_SND_CTL_INPUT_VALIDATION=y
 CONFIG_SND_CTL_VALIDATION=y
 CONFIG_SND_CTXFI=m
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -6731,7 +6731,7 @@ CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
 # CONFIG_SND_CTL_DEBUG is not set
-CONFIG_SND_CTL_INPUT_VALIDATION=y
+# CONFIG_SND_CTL_INPUT_VALIDATION is not set
 # CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@ -5775,7 +5775,7 @@ CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
-# CONFIG_SND_CTL_DEBUG is not set
+CONFIG_SND_CTL_DEBUG=y
 CONFIG_SND_CTL_INPUT_VALIDATION=y
 CONFIG_SND_CTL_VALIDATION=y
 CONFIG_SND_CTXFI=m
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@ -5755,7 +5755,7 @@ CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
 # CONFIG_SND_CTL_DEBUG is not set
-CONFIG_SND_CTL_INPUT_VALIDATION=y
+# CONFIG_SND_CTL_INPUT_VALIDATION is not set
 # CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -5721,7 +5721,7 @@ CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 # CONFIG_SND_CS5530 is not set
 # CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTL_DEBUG is not set
+CONFIG_SND_CTL_DEBUG=y
 CONFIG_SND_CTL_INPUT_VALIDATION=y
 CONFIG_SND_CTL_VALIDATION=y
 CONFIG_SND_CTXFI=m
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -5701,7 +5701,7 @@ CONFIG_SND_CS46XX_NEW_DSP=y
 # CONFIG_SND_CS5530 is not set
 # CONFIG_SND_CS5535AUDIO is not set
 # CONFIG_SND_CTL_DEBUG is not set
-CONFIG_SND_CTL_INPUT_VALIDATION=y
+# CONFIG_SND_CTL_INPUT_VALIDATION is not set
 # CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -6147,7 +6147,7 @@ CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
-# CONFIG_SND_CTL_DEBUG is not set
+CONFIG_SND_CTL_DEBUG=y
 CONFIG_SND_CTL_INPUT_VALIDATION=y
 CONFIG_SND_CTL_VALIDATION=y
 CONFIG_SND_CTXFI=m
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -6128,7 +6128,7 @@ CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
 # CONFIG_SND_CTL_DEBUG is not set
-CONFIG_SND_CTL_INPUT_VALIDATION=y
+# CONFIG_SND_CTL_INPUT_VALIDATION is not set
 # CONFIG_SND_CTL_VALIDATION is not set
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
--- a/kernel.spec
+++ b/kernel.spec
@ -124,13 +124,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.0.0
 %define patchversion 6.0
-%define pkgrelease 0.rc5.20220913gite839a756012b.38
+%define pkgrelease 0.rc5.20220914git3245cb65fd91.39
 %define kversion 6
-%define tarfile_release 6.0-rc5-15-ge839a756012b
+%define tarfile_release 6.0-rc5-25-g3245cb65fd91
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20220913gite839a756012b.38%{?buildid}%{?dist}
+%define specrelease 0.rc5.20220914git3245cb65fd91.39%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.0.0

@ -3151,6 +3151,11 @@ fi
 #
 #
 %changelog
+* Wed Sep 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc5.3245cb65fd91.39]
+- Fix up SND_CTL debug options (Justin M. Forbes)
+- Revert "Merge branch 'sort_configs' into 'os-build'" (Justin M. Forbes)
+- Linux v6.0.0-0.rc5.3245cb65fd91
+
 * Tue Sep 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc5.e839a756012b.38]
 - redhat: create /boot symvers link if it doesn't exist (Jan Stancek)
 - redhat: set LC_ALL=C before sorting config content (Frantisek Hrbata)
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.0-rc5-15-ge839a756012b.tar.xz) = a51b6bbf27603de363a3e01935e6ae85b10c9e95352b868705fa7fa6cc93732e7310d57b7bebb5c003caf11a144890ab08381ab0ab7f6bbf6c274d3e23e450b5
-SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 47534cee608635b5a6a7387e6d216deabedd4b9c8fd1d3560f1a066c5069d780f1013a4e9bc146937a9426100395fa2c8fca8e4f5b7221ff6565f38a22c0c792
-SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 911aa5d31f887b5cf425b784a062fc3fe8278707c7b90bb62ac1414dc8927d132b1ddc0a943484ff9912e43e6630ee9230ed8b425b8222a8e06aff19ec58b215
+SHA512 (linux-6.0-rc5-25-g3245cb65fd91.tar.xz) = 35ba352b23c0413e839d78eb5b56b0964f4d82ef0e727e43b11a7cdcafb467f9849df951a55dddfe57357b3cd6a8c67eeafaff24cc4208f52748a4a191427ce5
+SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 78c29dae9d2de89010b5c3640ef2af11d5586a2930e6d61220107869891651f9cfc30de242b42ff556f641cd0f8557002bd05a3b11496d54c28cc3b649aed4ad
+SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = aacdcf3bd6b930d0d28990e6b6b0e4fe3e8a40446da2ef0f38612775a74f6da560d283a6b2e1cd8974c6a8c788c2325525a852752d83ddeee9e266f3406cd411