From 14090a5785a02fe92161f6be810e6f632da9f4b5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 1 May 2024 06:38:03 -0500 Subject: [PATCH] kernel-6.9.0-0.rc6.20240501git18daea77cca6.53 * Wed May 01 2024 Fedora Kernel Team [6.9.0-0.rc6.18daea77cca6.53] - redhat/configs: Enable CONFIG_DM_VDO in RHEL (Benjamin Marzinski) - redhat/configs: Enable DRM_NOUVEAU_GSP_DEFAULT everywhere (Neal Gompa) - Linux v6.9.0-0.rc6.18daea77cca6 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-64k-debug-rhel.config | 4 ++-- kernel-aarch64-64k-rhel.config | 4 ++-- kernel-aarch64-debug-rhel.config | 4 ++-- kernel-aarch64-rhel.config | 4 ++-- kernel-aarch64-rt-debug-rhel.config | 4 ++-- kernel-aarch64-rt-rhel.config | 4 ++-- kernel-ppc64le-debug-rhel.config | 4 ++-- kernel-ppc64le-rhel.config | 4 ++-- kernel-s390x-debug-rhel.config | 4 ++-- kernel-s390x-rhel.config | 4 ++-- kernel-s390x-zfcpdump-rhel.config | 4 ++-- kernel-x86_64-debug-rhel.config | 4 ++-- kernel-x86_64-rhel.config | 4 ++-- kernel-x86_64-rt-debug-rhel.config | 4 ++-- kernel-x86_64-rt-rhel.config | 4 ++-- kernel.changelog | 6 ++++++ kernel.spec | 11 ++++++++--- patch-6.9-redhat.patch | 14 +++++++------- sources | 6 +++--- 20 files changed, 55 insertions(+), 44 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index e3e32f88f..045195d74 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 = 52 +RHEL_RELEASE = 53 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index fc032cd2a..23e6404ec 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1489,7 +1489,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1590,7 +1590,7 @@ CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 1bad97778..2cc101dd1 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1481,7 +1481,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1582,7 +1582,7 @@ CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index d19037dea..66640b508 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1487,7 +1487,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1588,7 +1588,7 @@ CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 0fcb90b47..e33aae08d 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1479,7 +1479,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1580,7 +1580,7 @@ CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index ffc96c2c9..31bb4d36a 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1489,7 +1489,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1590,7 +1590,7 @@ CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 6e7566191..1bb771ab8 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1481,7 +1481,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1582,7 +1582,7 @@ CONFIG_DRM_MGAG200=m # CONFIG_DRM_MSM is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index f315a0af5..16c9bd786 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1269,7 +1269,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1366,7 +1366,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 6f65adc9e..d159e3488 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1261,7 +1261,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1358,7 +1358,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 7021bad38..19fe003e4 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1272,7 +1272,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1370,7 +1370,7 @@ CONFIG_DRM=m # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y # CONFIG_DRM_NOUVEAU is not set # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 6754d8819..9930f36f5 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1264,7 +1264,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1362,7 +1362,7 @@ CONFIG_DRM=m # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y # CONFIG_DRM_NOUVEAU is not set # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ffdd2eb4a..a72d510d1 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1266,7 +1266,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1364,7 +1364,7 @@ CONFIG_DRM=m # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y # CONFIG_DRM_NOUVEAU is not set # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 300edee6b..87c636cc7 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1353,7 +1353,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1480,7 +1480,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ec48f3766..a0d618fab 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1345,7 +1345,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1472,7 +1472,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 830019458..8c43b0b67 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -1355,7 +1355,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1482,7 +1482,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index e2e4e4fa6..02a223903 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -1347,7 +1347,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y @@ -1474,7 +1474,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_MGAG200=m # CONFIG_DRM_MXSFB is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y -# CONFIG_DRM_NOUVEAU_GSP_DEFAULT is not set +CONFIG_DRM_NOUVEAU_GSP_DEFAULT=y CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set diff --git a/kernel.changelog b/kernel.changelog index cd33e684b..25dc9b441 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,9 @@ +* Wed May 01 2024 Fedora Kernel Team [6.9.0-0.rc6.18daea77cca6.53] +- redhat/configs: Enable CONFIG_DM_VDO in RHEL (Benjamin Marzinski) +- redhat/configs: Enable DRM_NOUVEAU_GSP_DEFAULT everywhere (Neal Gompa) +- Linux v6.9.0-0.rc6.18daea77cca6 +Resolves: + * Tue Apr 30 2024 Fedora Kernel Team [6.9.0-0.rc6.52] - kernel.spec: adjust for livepatching kselftests (Joe Lawrence) - redhat/configs: remove CONFIG_TEST_LIVEPATCH (Joe Lawrence) diff --git a/kernel.spec b/kernel.spec index c55b73da5..8b5e54c50 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.rc6.52 +%define pkgrelease 0.rc6.20240501git18daea77cca6.53 %define kversion 6 -%define tarfile_release 6.9-rc6 +%define tarfile_release 6.9-rc6-46-g18daea77cca6 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.52%{?buildid}%{?dist} +%define specrelease 0.rc6.20240501git18daea77cca6.53%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -3950,6 +3950,11 @@ fi\ # # %changelog +* Wed May 01 2024 Fedora Kernel Team [6.9.0-0.rc6.18daea77cca6.53] +- redhat/configs: Enable CONFIG_DM_VDO in RHEL (Benjamin Marzinski) +- redhat/configs: Enable DRM_NOUVEAU_GSP_DEFAULT everywhere (Neal Gompa) +- Linux v6.9.0-0.rc6.18daea77cca6 + * Tue Apr 30 2024 Fedora Kernel Team [6.9.0-0.rc6.52] - kernel.spec: adjust for livepatching kselftests (Joe Lawrence) - redhat/configs: remove CONFIG_TEST_LIVEPATCH (Joe Lawrence) diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index 129bc888a..e422e7d2d 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -2162,7 +2162,7 @@ index 675332e49a7b..4a3cbddacef1 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 58fdf679341d..4a1f0b9eb0de 100644 +index 65cdc8b77e35..7916ecf1af90 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -119,6 +119,14 @@ static const char *sd_cache_types[] = { @@ -2180,7 +2180,7 @@ index 58fdf679341d..4a1f0b9eb0de 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4247,6 +4255,8 @@ static int __init init_sd(void) +@@ -4249,6 +4257,8 @@ static int __init init_sd(void) goto err_out_class; } @@ -2222,20 +2222,20 @@ index a14f6013e316..6c20453fdf76 100644 error_proc: diff --git a/fs/erofs/super.c b/fs/erofs/super.c -index c0eb139adb07..19ded3068180 100644 +index 30b49b2eee53..0ff37b43e0ec 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c -@@ -583,6 +583,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -582,6 +582,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; + struct erofs_sb_info *sbi = EROFS_SB(sb); +#ifdef CONFIG_RHEL_DIFFERENCES + static bool printed = false; +#endif 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); diff --git a/sources b/sources index c1fced5b8..865571442 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-rc6.tar.xz) = f204fea5b89b217eea56a039bf2473a9a2360559710bdf02eb815f997eebcbbed5db4add17b47683d4a03421f98fd22dc9b70156d5ddb9065a8aceb0bd27b3fa -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 97409a5a9e03dac5c398e19690153f83615a0fd64cfe0b7433f635866ab7e93bde46b43bb20d7c3f4662a871b0e7c254cd4867f71140b6c964ee928f1f9e583e -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = d65b0e5b4f4fce65b8c0b456dc813c5f7fd01f4a3a37ffc3a9af220b7e44fb26856e1591eaba3e9278064e28d36cdb9bd1358fc0ecd9e267050124f798cfa067 +SHA512 (linux-6.9-rc6-46-g18daea77cca6.tar.xz) = 28182f5751197bd8c4f8864ef23751192c87ab74aeb67ce27a9ff46d18c5c44356dbcb18a96b1718a86bb81e5b75a01c7a231fc4110d28b4ef7255417dbc0de5 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = d946eea829385d66d7b7d230b9e10fd58f3c64c114bde938f6dd8c2c75162f9381ae34dd63e3f0c8ef54362a339943f5a980da8f6af995a8a766a40b4384886f +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 6c5c5a2476ebb9bd97901ec8d00c3dba574add657b7b8ad674cb78864e59ec03559ac44efd5c2c90bb710030b6f3768d4619429528730d52385279fbd95d57a3