From a4fa070b5f3ab7f3c051716535e9f2dde512489e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 1 Oct 2024 10:46:29 -0600 Subject: [PATCH] kernel-6.12.0-0.rc1.20241001gite32cde8d2bd7.18 * Tue Oct 01 2024 Fedora Kernel Team [6.12.0-0.rc1.e32cde8d2bd7.18] - redhat: ignore rpminspect runpath report on selftests/bpf/cpuv4/urandom_read (Viktor Malik) - Linux v6.12.0-0.rc1.e32cde8d2bd7 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 --- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 2 +- kernel-aarch64-64k-debug-rhel.config | 2 +- kernel-aarch64-64k-rhel.config | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-aarch64-rt-debug-rhel.config | 2 +- kernel-aarch64-rt-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 1 - kernel-ppc64le-rhel.config | 1 - kernel-s390x-debug-rhel.config | 1 - kernel-s390x-rhel.config | 1 - kernel-s390x-zfcpdump-rhel.config | 1 - kernel-x86_64-debug-rhel.config | 1 - kernel-x86_64-rhel.config | 1 - kernel-x86_64-rt-debug-rhel.config | 1 - kernel-x86_64-rt-rhel.config | 1 - kernel.changelog | 5 +++++ kernel.spec | 11 ++++++----- patch-6.12-redhat.patch | 16 +--------------- rpminspect.yaml | 1 + sources | 6 +++--- 26 files changed, 27 insertions(+), 46 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index cb2beaa85..7db7c7804 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 = 17 +RHEL_RELEASE = 18 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index f756b9820..856601fa9 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,3 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/c8fbb331060c5fca78fdc6e574a82671aee93885 - c8fbb331060c5fca78fdc6e574a82671aee93885 bcachefs: rename version -> bversion for big endian builds - https://gitlab.com/cki-project/kernel-ark/-/commit/77e6d045cb6220934aef9b192b291466fd205d21 77e6d045cb6220934aef9b192b291466fd205d21 Revert "Merge branch 'drop_engine_api' into 'os-build'" diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 8834fb3f1..cfad14654 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -1404,7 +1404,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_VDSO is not set CONFIG_COMPAT=y # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index e7288366f..a6f062e97 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -1404,7 +1404,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_VDSO is not set CONFIG_COMPAT=y # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index d9e1099c6..9045f8d3d 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1061,7 +1061,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 68d225cca..d7a21f137 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1061,7 +1061,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index baa103795..fdf898886 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1404,7 +1404,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_VDSO is not set CONFIG_COMPAT=y # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 96305b6e8..3477003e4 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1059,7 +1059,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index e6e38f0ab..173745b75 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1404,7 +1404,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_VDSO is not set CONFIG_COMPAT=y # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 2eebd18cb..21011aca0 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1059,7 +1059,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 336a8aae5..5f49a69c0 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1059,7 +1059,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index c0e5cb52c..bd56a4766 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1059,7 +1059,7 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set +CONFIG_COMPRESSED_INSTALL=y CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index a88454dda..00fafdc60 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -877,7 +877,6 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 8255ed5f8..5a1883c26 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -877,7 +877,6 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index eab8621f0..02a8e8b3a 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -878,7 +878,6 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_BRK is not set CONFIG_COMPAT=y # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index e10543002..2e9115e35 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -878,7 +878,6 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_BRK is not set CONFIG_COMPAT=y # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index eca225505..25011cbe9 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -879,7 +879,6 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set CONFIG_CONFIGFS_FS=y # CONFIG_CONNECTOR is not set CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 879d8e251..672313c50 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -908,7 +908,6 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 86561280b..c58726dcb 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -908,7 +908,6 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 7aaba7f8c..abc80e21e 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -908,7 +908,6 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 1859a4d20..90460b8cd 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -908,7 +908,6 @@ CONFIG_COMPAT_32BIT_TIME=y # CONFIG_COMPAT_BRK is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_COMPILE_TEST is not set -# CONFIG_COMPRESSED_INSTALL is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 diff --git a/kernel.changelog b/kernel.changelog index b5380d154..f233f95a6 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,8 @@ +* Tue Oct 01 2024 Fedora Kernel Team [6.12.0-0.rc1.e32cde8d2bd7.18] +- redhat: ignore rpminspect runpath report on selftests/bpf/cpuv4/urandom_read (Viktor Malik) +- Linux v6.12.0-0.rc1.e32cde8d2bd7 +Resolves: + * Mon Sep 30 2024 Fedora Kernel Team [6.12.0-0.rc1.17] - Linux v6.12.0-0.rc1 Resolves: diff --git a/kernel.spec b/kernel.spec index ce9bd3d00..57bacfc8a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 0.rc1.17 +%define pkgrelease 0.rc1.20241001gite32cde8d2bd7.18 %define kversion 6 -%define tarfile_release 6.12-rc1 +%define tarfile_release 6.12-rc1-31-ge32cde8d2bd7 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.17%{?buildid}%{?dist} +%define specrelease 0.rc1.20241001gite32cde8d2bd7.18%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -4136,8 +4136,9 @@ fi\ # # %changelog -* Mon Sep 30 2024 Justin M. Forbes [6.12.0-0.rc1.17] -- bcachefs: rename version -> bversion for big endian builds (Guenter Roeck) +* Tue Oct 01 2024 Fedora Kernel Team [6.12.0-0.rc1.e32cde8d2bd7.18] +- redhat: ignore rpminspect runpath report on selftests/bpf/cpuv4/urandom_read (Viktor Malik) +- Linux v6.12.0-0.rc1.e32cde8d2bd7 * Mon Sep 30 2024 Fedora Kernel Team [6.12.0-0.rc1.17] - Linux v6.12.0-0.rc1 diff --git a/patch-6.12-redhat.patch b/patch-6.12-redhat.patch index 41c4e20fc..c3bd20aeb 100644 --- a/patch-6.12-redhat.patch +++ b/patch-6.12-redhat.patch @@ -49,7 +49,6 @@ drivers/scsi/sd.c | 13 + drivers/usb/core/hub.c | 7 + fs/afs/main.c | 3 + - fs/bcachefs/bcachefs_format.h | 2 +- fs/erofs/super.c | 9 + fs/ext4/super.c | 11 + include/linux/crypto.h | 3 + @@ -82,7 +81,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 84 files changed, 2759 insertions(+), 217 deletions(-) + 83 files changed, 2758 insertions(+), 216 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 1518343bbe22..c720321317ea 100644 @@ -2464,19 +2463,6 @@ index a14f6013e316..6c20453fdf76 100644 return ret; error_proc: -diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h -index 203ee627cab5..84832c2d4df9 100644 ---- a/fs/bcachefs/bcachefs_format.h -+++ b/fs/bcachefs/bcachefs_format.h -@@ -223,7 +223,7 @@ struct bkey { - #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - struct bpos p; - __u32 size; /* extent size, in sectors */ -- struct bversion version; -+ struct bversion bversion; - - __u8 pad[1]; - #endif diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 666873f745da..60e23ec59fa6 100644 --- a/fs/erofs/super.c diff --git a/rpminspect.yaml b/rpminspect.yaml index 26fc56667..639f1ea89 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -29,3 +29,4 @@ runpath: ignore: - /usr/libexec/kselftests/bpf/urandom_read - /usr/libexec/kselftests/bpf/no_alu32/urandom_read + - /usr/libexec/kselftests/bpf/cpuv4/urandom_read diff --git a/sources b/sources index dcf08ea1c..ce6805624 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.12-rc1.tar.xz) = 9dce5db77943544ddf73963112ddcf4ebbb1ccae6d37b984c030cca1dcbe3071bdb0a6db52a4cc26f0a81f64c44b6c3bcddde913c1b98c56fcfe82dbfc89e2b0 -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 9d7e7f988d02bf4ba77792ce54dbdca526713f6e10354ba6362adc46a0e62e7b443be0b8441300aa8ac759f896dc6b3a68268d0e058e37f1bfbe8694db63b89a -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 9f4bb2a12274584e8b86b3c249cca354c042cd253c84bcfbf644adbc76beaa1dbe9c3afcf7aea1be2d0b313b6c2349b3441d97014f453cdc6d45071b77bece31 +SHA512 (linux-6.12-rc1-31-ge32cde8d2bd7.tar.xz) = aa1efa979f5a358e73025a78545096ff354201031b3803035b3d1fbcb251a1fed2d454cee03c6b612cdd8b01fe8f02461e628dbf8395c204ef12004cd65d9aaa +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = b54b14d13c4e8fb4094c36c7cdf6324edc04d51932c88508f327ddca31303465f750bc0712def18e25218d0488e24ffd0e1ead088ebb3bf6630c2306dfadd52c +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 8fa15b0374161982a1aa1b942c78865cca476f5a80be41ffb5156bb7e8e463e1f71ac3488ce733f03632b3c5923e5834fd8d87a074044128812cd39995159ba3