From 8199fed87e4bfad9e117192a29b51f5126b1a016 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 20 Aug 2024 14:41:09 -0600 Subject: [PATCH 1/3] kernel-6.11.0-0.rc4.20240820git6e4436539ae1.38 * Tue Aug 20 2024 Fedora Kernel Team [6.11.0-0.rc4.6e4436539ae1.38] - Add weakdep support to the kernel spec (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 7 ++++++- kernel.spec | 15 ++++++++++----- patch-6.11-redhat.patch | 8 ++++---- sources | 6 +++--- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 1a1e2ffbd..c2930e3e8 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 = 37 +RHEL_RELEASE = 38 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index e113aabac..9f9978a0f 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,5 +1,10 @@ -* Mon Aug 19 2024 Fedora Kernel Team [6.11.0-0.rc4.37] +* Tue Aug 20 2024 Fedora Kernel Team [6.11.0-0.rc4.6e4436539ae1.38] +- Add weakdep support to the kernel spec (Justin M. Forbes) +Resolves: + +* Tue Aug 20 2024 Fedora Kernel Team [6.11.0-0.rc4.6e4436539ae1.37] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +- Linux v6.11.0-0.rc4.6e4436539ae1 Resolves: * Mon Aug 19 2024 Fedora Kernel Team [6.11.0-0.rc4.36] diff --git a/kernel.spec b/kernel.spec index 0350cd195..af1b6cee3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc4.37 +%define pkgrelease 0.rc4.20240820git6e4436539ae1.38 %define kversion 6 -%define tarfile_release 6.11-rc4 +%define tarfile_release 6.11-rc4-8-g6e4436539ae1 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.37%{?buildid}%{?dist} +%define specrelease 0.rc4.20240820git6e4436539ae1.38%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -2793,7 +2793,7 @@ BuildKernel() { # in case below list needs to be extended, remember to add a # matching ghost entry in the files section as well rm -f modules.{alias,alias.bin,builtin.alias.bin,builtin.bin} \ - modules.{dep,dep.bin,devname,softdep,symbols,symbols.bin} + modules.{dep,dep.bin,devname,softdep,symbols,symbols.bin,weakdep} popd } @@ -3991,6 +3991,7 @@ fi\ %ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.softdep\ %ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.symbols\ %ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.symbols.bin\ +%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.weakdep\ %{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\ %{expand:%%files %{?3:%{3}-}devel}\ %defverify(not mtime)\ @@ -4097,8 +4098,12 @@ fi\ # # %changelog -* Mon Aug 19 2024 Fedora Kernel Team [6.11.0-0.rc4.37] +* Tue Aug 20 2024 Fedora Kernel Team [6.11.0-0.rc4.6e4436539ae1.38] +- Add weakdep support to the kernel spec (Justin M. Forbes) + +* Tue Aug 20 2024 Fedora Kernel Team [6.11.0-0.rc4.6e4436539ae1.37] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +- Linux v6.11.0-0.rc4.6e4436539ae1 * Mon Aug 19 2024 Fedora Kernel Team [6.11.0-0.rc4.36] - Linux v6.11.0-0.rc4 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index fb0812c23..22a392ba3 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -2528,10 +2528,10 @@ index 88ecc5e9f523..bcc0377c716a 100644 + #endif /* _LINUX_MODULE_H */ diff --git a/include/linux/panic.h b/include/linux/panic.h -index 3130e0b5116b..2b51f6eefcd6 100644 +index 54d90b6c5f47..cc5def6f2b2e 100644 --- a/include/linux/panic.h +++ b/include/linux/panic.h -@@ -73,7 +73,23 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout) +@@ -74,7 +74,23 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout) #define TAINT_AUX 16 #define TAINT_RANDSTRUCT 17 #define TAINT_TEST 18 @@ -3404,10 +3404,10 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/kernel/panic.c b/kernel/panic.c -index f861bedc1925..3b474ad6a6a7 100644 +index 2a0449144f82..a8feef83d920 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -502,6 +502,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { +@@ -508,6 +508,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { TAINT_FLAG(AUX, 'X', ' ', true), TAINT_FLAG(RANDSTRUCT, 'T', ' ', true), TAINT_FLAG(TEST, 'N', ' ', true), diff --git a/sources b/sources index 849a42f85..cfa7b3a61 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc4.tar.xz) = 30bdb3101583da58ebb06a52227d76216382874b4dbd5248dbbc9413d6ac223345a99fa00d3f088625c7402e55142828a019a61ad8ef431a144a84e6c21821c5 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = d311b0e6a80215acaecb0c6329d1315214402fdf09fcd9b75f67f772ce3b8f9f0334f9e3a7d10ce7f3e21e385d9c2a9735451d750adc6737e54ba3fad7407791 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = ab11eb70b0fa046a4ce50bc6ecf4a3f650969a8b7f5d15ee41ee8f592b3d6d138959b1fd2a1edc288b9ed7e42068b095ff3f8bff17d571fbe8c329e94fefd682 +SHA512 (linux-6.11-rc4-8-g6e4436539ae1.tar.xz) = a970dd078f688e415e7ae0779a13904e0a56f621ec53d50c1d5c77133da149e412f4d1e69d86a6c8a2245b1c2e9f134ce6891238adab8a0ae0fe4809ac9e169c +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 78a838fc472bfeb5f0e182ccd7c91098373df4b189e56ba487ad26e883f66090297bc0991952b5309a6d9d76c4c2e935d66b44c4a68964462227ea0fa8b9843e +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 9b28bd11a126809d49ff48c3fa326d494e31fc07683ccaa00e4e0cc31bcfdc055a4099d784a0a0a9d23171d552fbdc3ab5323934a09b46c94d9500b7bc47b70c From aad5a3f97c67821ac88498bd88a2b09e9a3600bf Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 22 Aug 2024 07:52:09 -0600 Subject: [PATCH 2/3] kernel-6.11.0-0.rc4.20240822git872cf28b8df9.40 * Thu Aug 22 2024 Fedora Kernel Team [6.11.0-0.rc4.872cf28b8df9.40] - Add weakdep support to the kernel spec (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 +++ kernel.changelog | 10 +++++++- kernel.spec | 17 +++++++++---- patch-6.11-redhat.patch | 53 +++++++++++++++++++++++++++++++++++++---- sources | 6 ++--- 6 files changed, 78 insertions(+), 13 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index c2930e3e8..3c64ec952 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 = 38 +RHEL_RELEASE = 40 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 8b5846284..1d6d97a82 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/4f35b86f59c38ce52c3ce5f22437f60885755008 + 4f35b86f59c38ce52c3ce5f22437f60885755008 pidfd: prevent creation of pidfds for kthreads + https://gitlab.com/cki-project/kernel-ark/-/commit/6425c2e128af3870617dd29da8110e7fa17b9ba9 6425c2e128af3870617dd29da8110e7fa17b9ba9 not upstream: Disable vdso getrandom when FIPS is enabled diff --git a/kernel.changelog b/kernel.changelog index 9f9978a0f..f5094a759 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,15 @@ -* Tue Aug 20 2024 Fedora Kernel Team [6.11.0-0.rc4.6e4436539ae1.38] +* Thu Aug 22 2024 Fedora Kernel Team [6.11.0-0.rc4.872cf28b8df9.40] - Add weakdep support to the kernel spec (Justin M. Forbes) Resolves: +* Thu Aug 22 2024 Fedora Kernel Team [6.11.0-0.rc4.872cf28b8df9.39] +- Linux v6.11.0-0.rc4.872cf28b8df9 +Resolves: + +* Wed Aug 21 2024 Fedora Kernel Team [6.11.0-0.rc4.b311c1b497e5.38] +- Linux v6.11.0-0.rc4.b311c1b497e5 +Resolves: + * Tue Aug 20 2024 Fedora Kernel Team [6.11.0-0.rc4.6e4436539ae1.37] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) - Linux v6.11.0-0.rc4.6e4436539ae1 diff --git a/kernel.spec b/kernel.spec index af1b6cee3..7b3220e6a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc4.20240820git6e4436539ae1.38 +%define pkgrelease 0.rc4.20240822git872cf28b8df9.40 %define kversion 6 -%define tarfile_release 6.11-rc4-8-g6e4436539ae1 +%define tarfile_release 6.11-rc4-33-g872cf28b8df9 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20240820git6e4436539ae1.38%{?buildid}%{?dist} +%define specrelease 0.rc4.20240822git872cf28b8df9.40%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4098,9 +4098,18 @@ fi\ # # %changelog -* Tue Aug 20 2024 Fedora Kernel Team [6.11.0-0.rc4.6e4436539ae1.38] +* Thu Aug 22 2024 Justin M. Forbes [6.11.0-0.rc4.20240822git872cf28b8df9.40] +- pidfd: prevent creation of pidfds for kthreads (Christian Brauner) + +* Thu Aug 22 2024 Fedora Kernel Team [6.11.0-0.rc4.872cf28b8df9.40] - Add weakdep support to the kernel spec (Justin M. Forbes) +* Thu Aug 22 2024 Fedora Kernel Team [6.11.0-0.rc4.872cf28b8df9.39] +- Linux v6.11.0-0.rc4.872cf28b8df9 + +* Wed Aug 21 2024 Fedora Kernel Team [6.11.0-0.rc4.b311c1b497e5.38] +- Linux v6.11.0-0.rc4.b311c1b497e5 + * Tue Aug 20 2024 Fedora Kernel Team [6.11.0-0.rc4.6e4436539ae1.37] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) - Linux v6.11.0-0.rc4.6e4436539ae1 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 22a392ba3..81ba61f57 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -64,6 +64,7 @@ init/main.c | 3 + kernel/Makefile | 1 + kernel/bpf/syscall.c | 23 + + kernel/fork.c | 25 +- kernel/module/main.c | 13 + kernel/module/signing.c | 9 +- kernel/panic.c | 13 + @@ -78,7 +79,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 80 files changed, 2685 insertions(+), 258 deletions(-) + 81 files changed, 2688 insertions(+), 280 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 09126bb8cc9f..ee2984e46c06 100644 @@ -2340,10 +2341,10 @@ index a14f6013e316..6c20453fdf76 100644 error_proc: diff --git a/fs/erofs/super.c b/fs/erofs/super.c -index 32ce5b35e1df..eb0d6e5822fd 100644 +index 6cb5c8916174..34b899ab37bb 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c -@@ -595,6 +595,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -581,6 +581,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) { struct inode *inode; struct erofs_sb_info *sbi = EROFS_SB(sb); @@ -2353,7 +2354,7 @@ index 32ce5b35e1df..eb0d6e5822fd 100644 int err; sb->s_magic = EROFS_SUPER_MAGIC; -@@ -701,6 +704,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -687,6 +690,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) return err; erofs_info(sb, "mounted with root inode @ nid %llu.", sbi->root_nid); @@ -3328,6 +3329,50 @@ index bf6c5f685ea2..649f2fccaddd 100644 *(int *)table->data = unpriv_enable; } +diff --git a/kernel/fork.c b/kernel/fork.c +index 18bdc87209d0..cc760491f201 100644 +--- a/kernel/fork.c ++++ b/kernel/fork.c +@@ -2053,23 +2053,10 @@ static int __pidfd_prepare(struct pid *pid, unsigned int flags, struct file **re + */ + int pidfd_prepare(struct pid *pid, unsigned int flags, struct file **ret) + { +- if (!pid) +- return -EINVAL; +- +- scoped_guard(rcu) { +- struct task_struct *tsk; +- +- if (flags & PIDFD_THREAD) +- tsk = pid_task(pid, PIDTYPE_PID); +- else +- tsk = pid_task(pid, PIDTYPE_TGID); +- if (!tsk) +- return -EINVAL; ++ bool thread = flags & PIDFD_THREAD; + +- /* Don't create pidfds for kernel threads for now. */ +- if (tsk->flags & PF_KTHREAD) +- return -EINVAL; +- } ++ if (!pid || !pid_has_task(pid, thread ? PIDTYPE_PID : PIDTYPE_TGID)) ++ return -EINVAL; + + return __pidfd_prepare(pid, flags, ret); + } +@@ -2416,12 +2403,6 @@ __latent_entropy struct task_struct *copy_process( + if (clone_flags & CLONE_PIDFD) { + int flags = (clone_flags & CLONE_THREAD) ? PIDFD_THREAD : 0; + +- /* Don't create pidfds for kernel threads for now. */ +- if (args->kthread) { +- retval = -EINVAL; +- goto bad_fork_free_pid; +- } +- + /* Note that no task has been attached to @pid yet. */ + retval = __pidfd_prepare(pid, flags, &pidfile); + if (retval < 0) diff --git a/kernel/module/main.c b/kernel/module/main.c index 71396e297499..29e469418075 100644 --- a/kernel/module/main.c diff --git a/sources b/sources index cfa7b3a61..bc6f779d9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc4-8-g6e4436539ae1.tar.xz) = a970dd078f688e415e7ae0779a13904e0a56f621ec53d50c1d5c77133da149e412f4d1e69d86a6c8a2245b1c2e9f134ce6891238adab8a0ae0fe4809ac9e169c -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 78a838fc472bfeb5f0e182ccd7c91098373df4b189e56ba487ad26e883f66090297bc0991952b5309a6d9d76c4c2e935d66b44c4a68964462227ea0fa8b9843e -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 9b28bd11a126809d49ff48c3fa326d494e31fc07683ccaa00e4e0cc31bcfdc055a4099d784a0a0a9d23171d552fbdc3ab5323934a09b46c94d9500b7bc47b70c +SHA512 (linux-6.11-rc4-33-g872cf28b8df9.tar.xz) = 8af1587b74bf678727a10cea1276077baa99f7a1ee5b4a6b0adb5dfe50b3a97659b3b2e473090b5f9052b4fe0f27787ee1cdd109a7f7874a008d4848c73f86ba +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 1998c3bc649c1711bab6e2f19619de86cba7d4b299af642662156a907bbdfbff2d49469f94ef0072311888b8b7a41a0fa7e092d5a2253c648330849306547295 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = eede5a0987ad29a1dab1ff1122b54efe4232b1f4d1dc0e2753cda48353df0b3a22e92ecbec285e929d5abade07d9ac9cea47309a6bbec69111920d99dd3f0f5a From 17565722aae99330a5cfdb50994d35c6d8b44e2f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 25 Aug 2024 09:49:51 -0600 Subject: [PATCH 3/3] kernel-6.11.0-0.rc5.43 * Sun Aug 25 2024 Fedora Kernel Team [6.11.0-0.rc5.43] - Revert "pidfd: prevent creation of pidfds for kthreads" (Christian Brauner) - Add weakdep support to the kernel spec (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel-aarch64-16k-debug-fedora.config | 1 + kernel-aarch64-16k-fedora.config | 1 + kernel-aarch64-64k-debug-rhel.config | 1 + kernel-aarch64-64k-rhel.config | 1 + kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 1 + kernel-aarch64-rhel.config | 1 + kernel-aarch64-rt-debug-rhel.config | 1 + kernel-aarch64-rt-rhel.config | 1 + kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 1 + kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 1 + kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 1 + kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-fedora.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 | 15 ++++++++++++++- kernel.spec | 21 ++++++++++++++------- patch-6.11-redhat.patch | 18 +++++++++--------- sources | 6 +++--- 31 files changed, 68 insertions(+), 23 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 3c64ec952..8ceb9d970 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 = 40 +RHEL_RELEASE = 43 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 1d6d97a82..d1b85c3c6 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/4f35b86f59c38ce52c3ce5f22437f60885755008 - 4f35b86f59c38ce52c3ce5f22437f60885755008 pidfd: prevent creation of pidfds for kthreads +https://gitlab.com/cki-project/kernel-ark/-/commit/f0422a4f19781da4d37e9d95c8df8eae5db72d0c + f0422a4f19781da4d37e9d95c8df8eae5db72d0c Revert "pidfd: prevent creation of pidfds for kthreads" https://gitlab.com/cki-project/kernel-ark/-/commit/6425c2e128af3870617dd29da8110e7fa17b9ba9 6425c2e128af3870617dd29da8110e7fa17b9ba9 not upstream: Disable vdso getrandom when FIPS is enabled diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index f4452a2a5..20090448b 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -6491,6 +6491,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 9382c51f8..e7d6125e9 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6464,6 +6464,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index d6db15627..5dffdd762 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -5258,6 +5258,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 9c5b055b5..407718e76 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -5235,6 +5235,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 271dd71ef..76c922b44 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6490,6 +6490,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 1d74ded39..7ad1024ef 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5254,6 +5254,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index c69d8f8d2..67e1268e6 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6463,6 +6463,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 9101d6011..a26b31403 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5231,6 +5231,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 977f60d76..2c2f7a9ea 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -5298,6 +5298,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 8e9e31a9e..a55089b23 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -5275,6 +5275,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index c56f7a558..3280f84ed 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5272,6 +5272,7 @@ CONFIG_RADIO_WL1273=m # CONFIG_RAID6_PQ_BENCHMARK is not set CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 8c0108563..0d42c2585 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4832,6 +4832,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 82357bccf..a13fe03e9 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5243,6 +5243,7 @@ CONFIG_RADIO_WL1273=m # CONFIG_RAID6_PQ_BENCHMARK is not set CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 5083d6feb..66df18151 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4811,6 +4811,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 9e6c650c1..4dd6411dd 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5194,6 +5194,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 45d6cb81b..978e4aea3 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4769,6 +4769,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index c7ef1f293..0774d837f 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5165,6 +5165,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 4914e7562..dc17a5339 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4748,6 +4748,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index c6a973c88..83702e7ad 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4760,6 +4760,7 @@ CONFIG_RADIO_TEA575X=m # CONFIG_RAID_ATTRS is not set # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 99f3fb34a..2eb73352e 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5685,6 +5685,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 9ec762498..8a8a6f504 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5052,6 +5052,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 61e8d3545..d91433cc8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5657,6 +5657,7 @@ CONFIG_RADIO_WL1273=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 44403b1f7..3225541b7 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -5030,6 +5030,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index c23791a89..dd39a2550 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -5096,6 +5096,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index e8328a9a7..22cf53846 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -5074,6 +5074,7 @@ CONFIG_RADIO_TEA575X=m CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_IDENTITY_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa diff --git a/kernel.changelog b/kernel.changelog index f5094a759..c586897c2 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,20 @@ -* Thu Aug 22 2024 Fedora Kernel Team [6.11.0-0.rc4.872cf28b8df9.40] +* Sun Aug 25 2024 Fedora Kernel Team [6.11.0-0.rc5.43] +- Revert "pidfd: prevent creation of pidfds for kthreads" (Christian Brauner) - Add weakdep support to the kernel spec (Justin M. Forbes) Resolves: +* Sun Aug 25 2024 Fedora Kernel Team [6.11.0-0.rc5.42] +- Linux v6.11.0-0.rc5 +Resolves: + +* Sat Aug 24 2024 Fedora Kernel Team [6.11.0-0.rc4.d2bafcf224f3.41] +- Linux v6.11.0-0.rc4.d2bafcf224f3 +Resolves: + +* Fri Aug 23 2024 Fedora Kernel Team [6.11.0-0.rc4.3d5f968a177d.40] +- Linux v6.11.0-0.rc4.3d5f968a177d +Resolves: + * Thu Aug 22 2024 Fedora Kernel Team [6.11.0-0.rc4.872cf28b8df9.39] - Linux v6.11.0-0.rc4.872cf28b8df9 Resolves: diff --git a/kernel.spec b/kernel.spec index 7b3220e6a..173b6c837 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc4.20240822git872cf28b8df9.40 +%define pkgrelease 0.rc5.43 %define kversion 6 -%define tarfile_release 6.11-rc4-33-g872cf28b8df9 +%define tarfile_release 6.11-rc5 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20240822git872cf28b8df9.40%{?buildid}%{?dist} +%define specrelease 0.rc5.43%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4098,12 +4098,19 @@ fi\ # # %changelog -* Thu Aug 22 2024 Justin M. Forbes [6.11.0-0.rc4.20240822git872cf28b8df9.40] -- pidfd: prevent creation of pidfds for kthreads (Christian Brauner) - -* Thu Aug 22 2024 Fedora Kernel Team [6.11.0-0.rc4.872cf28b8df9.40] +* Sun Aug 25 2024 Fedora Kernel Team [6.11.0-0.rc5.43] +- Revert "pidfd: prevent creation of pidfds for kthreads" (Christian Brauner) - Add weakdep support to the kernel spec (Justin M. Forbes) +* Sun Aug 25 2024 Fedora Kernel Team [6.11.0-0.rc5.42] +- Linux v6.11.0-0.rc5 + +* Sat Aug 24 2024 Fedora Kernel Team [6.11.0-0.rc4.d2bafcf224f3.41] +- Linux v6.11.0-0.rc4.d2bafcf224f3 + +* Fri Aug 23 2024 Fedora Kernel Team [6.11.0-0.rc4.3d5f968a177d.40] +- Linux v6.11.0-0.rc4.3d5f968a177d + * Thu Aug 22 2024 Fedora Kernel Team [6.11.0-0.rc4.872cf28b8df9.39] - Linux v6.11.0-0.rc4.872cf28b8df9 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 81ba61f57..ff85ee030 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -189,7 +189,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 68ebd6d6b444..66c7f3a31232 100644 +index 7b60eb103c5d..a571f56cedd7 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -281,7 +281,7 @@ index f17bb7bf9392..66e530380ee3 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 4ec99f73fa27..26d0037de1dd 100644 +index a3fea683b227..a3162d93f437 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -292,7 +292,7 @@ index 4ec99f73fa27..26d0037de1dd 100644 #include #include -@@ -894,6 +895,9 @@ void __init setup_arch(char **cmdline_p) +@@ -910,6 +911,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -1822,7 +1822,7 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 33fa01c599ad..dddde9be7037 100644 +index 0dc8bcc664f2..6c524e09b0d5 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -262,6 +262,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1939,10 +1939,10 @@ index 91d9eb3c22ef..d44cdba1ffea 100644 /* initialize this in the identify path to cover controller resets */ diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index ae5314d32943..7a8e1178d379 100644 +index da57947130cc..beef00ccfb26 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -942,6 +942,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -941,6 +941,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); void nvme_failover_req(struct request *req); @@ -1950,7 +1950,7 @@ index ae5314d32943..7a8e1178d379 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid); -@@ -984,6 +985,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) +@@ -983,6 +984,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) static inline void nvme_failover_req(struct request *req) { } @@ -2278,7 +2278,7 @@ index 17cccd14765f..7f0cef737224 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 699f4f9674d9..12c5593b9358 100644 +index dad3991397cf..64c033627c2c 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -122,6 +122,14 @@ static const char *sd_cache_types[] = { @@ -2296,7 +2296,7 @@ index 699f4f9674d9..12c5593b9358 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp, struct queue_limits *lim) { -@@ -4344,6 +4352,11 @@ static int __init init_sd(void) +@@ -4347,6 +4355,11 @@ static int __init init_sd(void) goto err_out_class; } diff --git a/sources b/sources index bc6f779d9..c44d714f7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc4-33-g872cf28b8df9.tar.xz) = 8af1587b74bf678727a10cea1276077baa99f7a1ee5b4a6b0adb5dfe50b3a97659b3b2e473090b5f9052b4fe0f27787ee1cdd109a7f7874a008d4848c73f86ba -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 1998c3bc649c1711bab6e2f19619de86cba7d4b299af642662156a907bbdfbff2d49469f94ef0072311888b8b7a41a0fa7e092d5a2253c648330849306547295 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = eede5a0987ad29a1dab1ff1122b54efe4232b1f4d1dc0e2753cda48353df0b3a22e92ecbec285e929d5abade07d9ac9cea47309a6bbec69111920d99dd3f0f5a +SHA512 (linux-6.11-rc5.tar.xz) = ff448b1f89c72e7f6b55049cd7cc090971b8fd138f37797ea75b2294aa47f6e625874b2bc5958d57f1c3535d3926374bafb15661e42dad34bb41692f0e0d016b +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = f1335e684c694ca921a702c6e13dc7cf6184294db2b8671161b6689d483722cd7c2970bb74df7c2da55b5f9c80e9144adf0a7d6f7b7225022b2f368ec821da50 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = ccd65f0cbf5f967b6a49f1d8e596e065f389177bd496715d5dd2bb8b7b735dcdeb1d4eff1cf55a62d1aaa92bcf98c9a7bc4f931e0ec2c09eba63acd573581e04