diff --git a/Makefile.rhelver b/Makefile.rhelver index f5b0b5535..933dc5093 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 = 60 +RHEL_RELEASE = 61 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index af97092b9..83c40aef2 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/4ab353ee7fd3b6ed9eadfb77260de8976d983b1a + 4ab353ee7fd3b6ed9eadfb77260de8976d983b1a scsi: sd: condition probe_type under RHEL_DIFFERENCES + +https://gitlab.com/cki-project/kernel-ark/-/commit/0130c7220f300b67decb1d8c4d668fe05ea21a04 + 0130c7220f300b67decb1d8c4d668fe05ea21a04 scsi: sd: remove unused sd_probe_types + https://gitlab.com/cki-project/kernel-ark/-/commit/b57ff83c206c815792a50aa0dc14cc293b1937da b57ff83c206c815792a50aa0dc14cc293b1937da [redhat] rh_messages.h: mark mlx5 on Bluefield-3 as unmaintained diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 32ebd029d..3c33292c5 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -3385,7 +3385,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 7b6d10d37..455efbf71 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -3368,7 +3368,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 669db71a1..b27374f3c 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3385,7 +3385,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 2aecb9ba2..8bbb9236e 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3368,7 +3368,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 29e79b763..09f4ad869 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2696,7 +2696,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 9dce7a859..08b6102d7 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2676,7 +2676,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 91e1089cb..8892636e3 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2668,7 +2668,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 3bc614560..2d9612609 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2648,7 +2648,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 565785fb8..708627b0c 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2960,7 +2960,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m CONFIG_INFINIBAND_VMWARE_PVRDMA=m # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 5774d65f7..b5b6f50db 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2940,7 +2940,7 @@ CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m CONFIG_INFINIBAND_VMWARE_PVRDMA=m # CONFIG_INFTL is not set -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" diff --git a/kernel.changelog b/kernel.changelog index 4a10dca31..e8585eacd 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,10 @@ +* Thu May 09 2024 Fedora Kernel Team [6.9.0-0.rc7.45db3ab70092.61] +- scsi: sd: condition probe_type under RHEL_DIFFERENCES (Eric Chanudet) +- scsi: sd: remove unused sd_probe_types (Eric Chanudet) +- Turn on INIT_ON_ALLOC_DEFAULT_ON for Fedora (Justin M. Forbes) +- Linux v6.9.0-0.rc7.45db3ab70092 +Resolves: + * Wed May 08 2024 Fedora Kernel Team [6.9.0-0.rc7.dccb07f2914c.60] - Consolidate configs to common for 6.9 (Justin M. Forbes) Resolves: diff --git a/kernel.spec b/kernel.spec index 3f38f43ad..32dfb6289 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.rc7.20240508gitdccb07f2914c.60 +%define pkgrelease 0.rc7.20240509git45db3ab70092.61 %define kversion 6 -%define tarfile_release 6.9-rc7-12-gdccb07f2914c +%define tarfile_release 6.9-rc7-56-g45db3ab70092 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20240508gitdccb07f2914c.60%{?buildid}%{?dist} +%define specrelease 0.rc7.20240509git45db3ab70092.61%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -3936,6 +3936,12 @@ fi\ # # %changelog +* Thu May 09 2024 Fedora Kernel Team [6.9.0-0.rc7.45db3ab70092.61] +- scsi: sd: condition probe_type under RHEL_DIFFERENCES (Eric Chanudet) +- scsi: sd: remove unused sd_probe_types (Eric Chanudet) +- Turn on INIT_ON_ALLOC_DEFAULT_ON for Fedora (Justin M. Forbes) +- Linux v6.9.0-0.rc7.45db3ab70092 + * Wed May 08 2024 Fedora Kernel Team [6.9.0-0.rc7.dccb07f2914c.60] - Consolidate configs to common for 6.9 (Justin M. Forbes) diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index a9bec5068..5d0e9f614 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -41,7 +41,7 @@ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 + drivers/scsi/qla2xxx/qla_os.c | 6 + drivers/scsi/qla4xxx/ql4_os.c | 2 + - drivers/scsi/sd.c | 10 + + drivers/scsi/sd.c | 13 + drivers/usb/core/hub.c | 7 + fs/afs/main.c | 3 + fs/erofs/super.c | 9 + @@ -71,13 +71,13 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 73 files changed, 2357 insertions(+), 207 deletions(-) + 73 files changed, 2360 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 213d0719e2b7..c3495f6bbfdc 100644 +index 396137ee018d..ff1db21fad9c 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6893,6 +6893,15 @@ +@@ -6894,6 +6894,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -2162,30 +2162,33 @@ index 675332e49a7b..4a3cbddacef1 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 65cdc8b77e35..7916ecf1af90 100644 +index 65cdc8b77e35..af5fb98808aa 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -119,6 +119,14 @@ static const char *sd_cache_types[] = { "write back, no read (daft)" }; -+static const char *sd_probe_types[] = { "async", "sync" }; -+ ++#ifdef CONFIG_RHEL_DIFFERENCES +static char sd_probe_type[6] = "async"; +module_param_string(probe, sd_probe_type, sizeof(sd_probe_type), + S_IRUGO|S_IWUSR); +MODULE_PARM_DESC(probe, "async or sync. Setting to 'sync' disables asynchronous " + "device number assignments (sda, sdb, ...)."); ++#endif + static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4249,6 +4257,8 @@ static int __init init_sd(void) +@@ -4249,6 +4257,11 @@ static int __init init_sd(void) goto err_out_class; } ++#ifdef CONFIG_RHEL_DIFFERENCES + if (!strcmp(sd_probe_type, "sync")) + sd_template.gendrv.probe_type = PROBE_FORCE_SYNCHRONOUS; ++#endif ++ err = scsi_register_driver(&sd_template.gendrv); if (err) goto err_out_driver; diff --git a/sources b/sources index 4e39047d9..8ce5b24f0 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-rc7-12-gdccb07f2914c.tar.xz) = 5120f14394d29550e656f5ce1b568a8a4d28ee3b58a2c8862141236bd1bd3330b2a40ec72761077f9e88ebed9053b1b1f9ba73f79c983d9558fc034995802d04 -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = f74794ae7e81c4d4e38b076b7b2e8950a44e7160ab420c21b2725b72a3abc32deaaab083580281849a49a62f3c80066479c399978a3fd3d11a5b0413524a5cad -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 18380cacfe0577cd5d2d7da4ad1e5e8dc1dec06dc3ec465b9f9dbfba62a7dda1ed409a9a03ea53a89d85bac94a33c3d265d5d1b756f9341d35439d3ececd88b2 +SHA512 (linux-6.9-rc7-56-g45db3ab70092.tar.xz) = c68d7e48f9d3f91181966ac8d4d690fe2973ae5390e2cccf258d30a40c443275b5a29ca0a9351db765de4901635dac26a8d5c700ab069f397502ac6f4e083cd8 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = d1b3d975dc155a8cc653d82e6ef411e7cbb627acbcbf9c10126b131d2499fa2b33919f5fc2e1a10692766347499963e0ef74b5d960c2967018b3fe3d92ee00a3 +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 8cfc3a8ae911cbb229333b04e55a57247f399e240601fae072d7564c22eede60520d4895d69be779c6e2a27716a2e234570a48a5e2a963ac3d34c2366f20a382