From 4a882a6f68e12ced2353c09c9a1b7ea6a32d5079 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 19 Dec 2023 13:36:22 -0600 Subject: [PATCH] kernel-6.7.0-0.rc6.20231219git2cf4f94d8e86.49 * Tue Dec 19 2023 Fedora Kernel Team [6.7.0-0.rc6.2cf4f94d8e86.49] - Linux v6.7.0-0.rc6.2cf4f94d8e86 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-64k-debug-rhel.config | 2 +- kernel-aarch64-64k-rhel.config | 2 +- kernel-aarch64-debug-rhel.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 | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel-x86_64-rt-debug-rhel.config | 2 +- kernel-x86_64-rt-rhel.config | 2 +- kernel.spec | 9 ++++++--- patch-6.7-redhat.patch | 6 +++--- sources | 6 +++--- 19 files changed, 28 insertions(+), 25 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 076ae9c59..943e2e14a 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 = 48 +RHEL_RELEASE = 49 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 731571de7..cea4e5561 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -6931,7 +6931,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 2fa3a277b..06208e902 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -6906,7 +6906,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 4e611f5d7..f18ba2784 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -6927,7 +6927,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index a49bf5708..3f8a0f196 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -6902,7 +6902,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 99c8c8681..e260b5050 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -6981,7 +6981,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 84f81017b..5fbf5fbd5 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -6956,7 +6956,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 24cc679eb..a3d173271 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -6440,7 +6440,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 802308ec7..e4aecc973 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -6417,7 +6417,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index d82fa1c9d..c196a0f70 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -6409,7 +6409,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 69b08d574..87b751118 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -6386,7 +6386,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 077767062..d18479402 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6408,7 +6408,7 @@ CONFIG_TCM_IBLOCK=y CONFIG_TCM_PSCSI=y # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 65879f2f7..e6e63b25a 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -6681,7 +6681,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 61e1f9c9a..b1eb910c7 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -6657,7 +6657,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 261852ba5..2f9e0abed 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -6735,7 +6735,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 86abc8eef..569ab431f 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -6711,7 +6711,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m # CONFIG_TCM_QLA2XXX is not set CONFIG_TCM_USER2=m -# CONFIG_TCP_AO is not set +CONFIG_TCP_AO=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=m CONFIG_TCP_CONG_BIC=m diff --git a/kernel.spec b/kernel.spec index f618e9694..01341561f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc6.48 +%define pkgrelease 0.rc6.20231219git2cf4f94d8e86.49 %define kversion 6 -%define tarfile_release 6.7-rc6 +%define tarfile_release 6.7-rc6-10-g2cf4f94d8e86 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.48%{?buildid}%{?dist} +%define specrelease 0.rc6.20231219git2cf4f94d8e86.49%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3754,6 +3754,9 @@ fi\ # # %changelog +* Tue Dec 19 2023 Fedora Kernel Team [6.7.0-0.rc6.2cf4f94d8e86.49] +- Linux v6.7.0-0.rc6.2cf4f94d8e86 + * Mon Dec 18 2023 Fedora Kernel Team [6.7.0-0.rc6.48] - Disable accel drivers for Fedora x86 (Kate Hsuan) - redhat: scripts: An automation script for disabling unused driver for x86 (Kate Hsuan) diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 0af3e7d89..65f377bf9 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -1869,10 +1869,10 @@ index ea476252280a..d81cc740aad8 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c -index c4a36c0be527..6ca4061cd164 100644 +index 68f4dbcfff49..90a6070a1332 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c -@@ -78,6 +78,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION; +@@ -77,6 +77,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION; * Note: The last field is used to index into aac_drivers below. */ static const struct pci_device_id aac_pci_tbl[] = { @@ -1880,7 +1880,7 @@ index c4a36c0be527..6ca4061cd164 100644 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */ { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */ { 0x1028, 0x0003, 0x1028, 0x0003, 0, 0, 2 }, /* PERC 3/Si (SlimFast/PERC3Si */ -@@ -145,6 +146,7 @@ static const struct pci_device_id aac_pci_tbl[] = { +@@ -144,6 +145,7 @@ static const struct pci_device_id aac_pci_tbl[] = { { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */ { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */ { 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */ diff --git a/sources b/sources index 90ab0e869..5f979a359 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.7-rc6.tar.xz) = 6fb20b92ca406b883a6eb80f8cd7e7afb2a2f1d8e40e49acd70f653b84e6b75901c64b16048529f72db6b69a3fbf514f53c9950178a8eebb08e28dd6a22bfdd0 -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 7946056ed089b39367583d7ad979eb577958a2d873caac71aac025ae0d6978fc793e4304ffd65031aa3124cbee435dc4e55db6717062fcad20f2eb9128cbce00 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = f7eee04ff75206c8062beb81e1f6be69abc30b0007a33065a0c318fec29a62e03f62ef21b2604ffd22bfac4fb1ccb8556d062d0f990ed52f8302aec5bcc3fdf2 +SHA512 (linux-6.7-rc6-10-g2cf4f94d8e86.tar.xz) = 462fe003d2f8d3ddef56c8233156e9ca59760bd518198537ef1b68848ebd3c57f931fef23644d17d55f2cb7763e40cd3eae0e7e85210f8fd483d594e602580d8 +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = c067306d03bd82d811b54eaf5a1baf58316b69654ed021ca73eb95b898ee0c8e2a35bd7a88c7611428732bbe85dab1b5ee4a88ae1d7d2d66cf31cb63354ab7b1 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 506c6a8ffd98aadaaef49603ca89250e52ca8003451b87d63cf045c61d6ab8b9c747584280357d60e9f04275b728e80e1df346067625c653bd98aa220ae39a39