From d16e024e8711bccf2187ce2b98de6e9a0e2e0e6b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 1 Feb 2023 08:36:35 -0600 Subject: [PATCH] kernel-6.2.0-0.rc6.20230201gitc0b67534c95c.46 * Wed Feb 01 2023 Fedora Kernel Team [6.2.0-0.rc6.c0b67534c95c.46] - Update self-test data to not expect debugbuildsenabled 0 (Justin M. Forbes) - Turn off forced debug builds (Justin M. Forbes) - Turn on debug builds for aarch64 Fedora (Justin M. Forbes) - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.spec | 13 +++++++++---- sources | 6 +++--- 15 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 762b2808b..aea44c38e 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 = 45 +RHEL_RELEASE = 46 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index e29852cb8..d7695fa77 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3843,7 +3843,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index be939cb66..2b4162ada 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3824,7 +3824,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 0925b1d79..3e212223f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -3800,7 +3800,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 255826e3b..60ed15d4f 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -3783,7 +3783,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 88a582f20..cda0cdcef 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -3729,7 +3729,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 01c38b5c6..fc345e859 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -3712,7 +3712,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 895907daf..08f2b025c 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3174,7 +3174,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 9463a0e74..10b164c2c 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3155,7 +3155,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c21022253..0532e2fb9 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3147,7 +3147,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 758279a70..e43071cf2 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3128,7 +3128,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 066e96906..9d5e0c34b 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3452,7 +3452,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index b8f104f7a..4b899ae72 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3433,7 +3433,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=16 -CONFIG_LOCKDEP_CHAINS_BITS=18 +CONFIG_LOCKDEP_CHAINS_BITS=19 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14 diff --git a/kernel.spec b/kernel.spec index 16fd5208d..313908d10 100755 --- a/kernel.spec +++ b/kernel.spec @@ -126,13 +126,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc6.20230131git22b8077d0fce.45 +%define pkgrelease 0.rc6.20230201gitc0b67534c95c.46 %define kversion 6 -%define tarfile_release 6.2-rc6-3-g22b8077d0fce +%define tarfile_release 6.2-rc6-11-gc0b67534c95c # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20230131git22b8077d0fce.45%{?buildid}%{?dist} +%define specrelease 0.rc6.20230201gitc0b67534c95c.46%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3220,12 +3220,17 @@ fi # # %changelog -* Tue Jan 31 2023 Fedora Kernel Team [6.2.0-0.rc6.22b8077d0fce.45] +* Wed Feb 01 2023 Fedora Kernel Team [6.2.0-0.rc6.c0b67534c95c.46] - Update self-test data to not expect debugbuildsenabled 0 (Justin M. Forbes) - Turn off forced debug builds (Justin M. Forbes) - Turn on debug builds for aarch64 Fedora (Justin M. Forbes) - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) +* Wed Feb 01 2023 Fedora Kernel Team [6.2.0-0.rc6.c0b67534c95c.45] +- Update rebase notes for Fedora (Justin M. Forbes) +- Update CONFIG_LOCKDEP_CHAINS_BITS to 19 (cmurf) +- Linux v6.2.0-0.rc6.c0b67534c95c + * Tue Jan 31 2023 Fedora Kernel Team [6.2.0-0.rc6.22b8077d0fce.44] - Linux v6.2.0-0.rc6.22b8077d0fce diff --git a/sources b/sources index 3fd53f355..5131b1520 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc6-3-g22b8077d0fce.tar.xz) = 6799d2fce53c926043ee82ecc1a15ebcd0f1dc67cef4b50b904b03cf2b8b956608381f93abd8d3cfaf513164d3c9111f2f4a33197600fe9488667ec3845b4f40 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = f8471c29b49c9d65c56774f33fb6c69f338003604f32a3749bef42d196ae314752e35c5db1c466a1290f2800c50184e4aca80a981459531a7a5be94ecf49d408 -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 134be9c5ad03180f37601ee87d905baee4fa8680ba8d71ec43e86ae7cd585900422865002229c4e8d2bf265696c6f737c4bf602c5bb6a8895d744b068a939e83 +SHA512 (linux-6.2-rc6-11-gc0b67534c95c.tar.xz) = ebd2f51763c95637bab98fdcd11ba7539e027cbe0afb994f742599e6dd5b303b59f900fc6e23876e90d05064977f11473f9de7fec94424c5f527124f0668bfce +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 29b52154fe439067394ac45bbc50fc5947d26550aeff77c15ba8e2daa04352bc02b863aad7a76a980d6e6bfc3262547189240d65192b6d2135266fe0e581475e +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = b5e4e82ac289fd13312028ad1b1c13f4317e825def727e6872d338ce190ef4e565f48a7839e73a44b103816a8bdd3b3ffe3b3d662dd843146f51d2bb857dbf2b