From e2cd4c7189fc844970f6f119ba27f91a810200ec Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Fri, 29 Mar 2024 14:39:30 +0100 Subject: [PATCH] kernel-6.9.0-0.rc1.20240329git317c7bc0ef03.20 * Fri Mar 29 2024 Fedora Kernel Team [6.9.0-0.rc1.317c7bc0ef03.20] - Linux v6.9.0-0.rc1.317c7bc0ef03 Resolves: Signed-off-by: Patrick Talbert --- Makefile.rhelver | 2 +- kernel.changelog | 8 ++++++++ kernel.spec | 12 +++++++++--- patch-6.9-redhat.patch | 8 ++++---- sources | 6 +++--- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 7db7c7804..4ef64a680 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 = 18 +RHEL_RELEASE = 20 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 273f6abee..1d0ae3863 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,11 @@ +* Fri Mar 29 2024 Fedora Kernel Team [6.9.0-0.rc1.317c7bc0ef03.20] +- Linux v6.9.0-0.rc1.317c7bc0ef03 +Resolves: + +* Thu Mar 28 2024 Fedora Kernel Team [6.9.0-0.rc1.8d025e2092e2.19] +- Linux v6.9.0-0.rc1.8d025e2092e2 +Resolves: + * Wed Mar 27 2024 Fedora Kernel Team [6.9.0-0.rc1.7033999ecd7b.18] - kernel.spec: fix libperf-debuginfo content (Jan Stancek) - Turn on DM_VDO for Fedora (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index 728299e51..2eec615e8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.9.0 %define specversion 6.9.0 %define patchversion 6.9 -%define pkgrelease 0.rc1.20240327git7033999ecd7b.18 +%define pkgrelease 0.rc1.20240329git317c7bc0ef03.20 %define kversion 6 -%define tarfile_release 6.9-rc1-9-g7033999ecd7b +%define tarfile_release 6.9-rc1-178-g317c7bc0ef03 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20240327git7033999ecd7b.18%{?buildid}%{?dist} +%define specrelease 0.rc1.20240329git317c7bc0ef03.20%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -3958,6 +3958,12 @@ fi\ # # %changelog +* Fri Mar 29 2024 Fedora Kernel Team [6.9.0-0.rc1.317c7bc0ef03.20] +- Linux v6.9.0-0.rc1.317c7bc0ef03 + +* Thu Mar 28 2024 Fedora Kernel Team [6.9.0-0.rc1.8d025e2092e2.19] +- Linux v6.9.0-0.rc1.8d025e2092e2 + * Wed Mar 27 2024 Fedora Kernel Team [6.9.0-0.rc1.7033999ecd7b.18] - kernel.spec: fix libperf-debuginfo content (Jan Stancek) - Turn on DM_VDO for Fedora (Justin M. Forbes) diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index a6a9c9848..f3b881cfc 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -1595,7 +1595,7 @@ index ef9ea295f9e0..0103334e8f32 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 098869007c69..2a979992c4bc 100644 +index a95a483def2d..e11ceb8b6df0 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -2222,10 +2222,10 @@ index a14f6013e316..6c20453fdf76 100644 error_proc: diff --git a/fs/erofs/super.c b/fs/erofs/super.c -index 69308fd73e4a..69ee109847e9 100644 +index c0eb139adb07..19ded3068180 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c -@@ -584,6 +584,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -583,6 +583,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) struct inode *inode; struct erofs_sb_info *sbi; struct erofs_fs_context *ctx = fc->fs_private; @@ -2235,7 +2235,7 @@ index 69308fd73e4a..69ee109847e9 100644 int err; sb->s_magic = EROFS_SUPER_MAGIC; -@@ -702,6 +705,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -701,6 +704,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); diff --git a/sources b/sources index 14b40f111..3826c9d0f 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.9-rc1-9-g7033999ecd7b.tar.xz) = 2e313ff864e9eb11b64dae93e2314d15262cf26e67bb40cd3b2651601764b0abb8a92cd8b583c4bf7628cd692d5bce77ad3d39fe05d37eeeee47c59f2344d18c -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = b14b0b2032d8d5f4808dad2d90a6f4d9c3bb95e2c66802b3b660a27c42a8da01e5ca1bb3c2beb58573dc79a51a8172f354456e43224bbdeb7f67001e77df1289 -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 70af6501da31b7f97ed62c480faec6ee60627da673247754c6c7a5fb2ab0f105759252be7d96c384c477fca9195b81cc850abe678c5058a944ff9ec42d458152 +SHA512 (linux-6.9-rc1-178-g317c7bc0ef03.tar.xz) = 5b013b0ad7d7f961fd6706ade1929f19433dce45152054aef8dcdb93e54ce3e1beff07de024998f2673d8a877879ea4b68210e158b0a24642a51414001eb609c +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = e40227b106466fa3e45bd8f3eed1d0a667dc260e793334a2002158fafb8e5670ceb8690d8fd2a6c62a8b0e3631b8a19e1c837cb76d7eccc3d69158606422165b +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 6843f87b07c45bcc5b92380720c64ffb6eb9114a0faab3d5f8eb35dd7321a6fa4d01fc0551e86e5dc27caf0e79a1d2d01f22b5d6f700179203415c010e59beb8