From af24b5dbb70cb8e6fc0333e6b36b054cb2d8f5c5 Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: Feb 28 2024 18:00:05 +0000 Subject: kernel-6.8.0-0.rc6.20240228gitcf1182944c7c.51 * Wed Feb 28 2024 Fedora Kernel Team [6.8.0-0.rc6.cf1182944c7c.51] - Revert "net: bump CONFIG_MAX_SKB_FRAGS to 45" (Marcelo Ricardo Leitner) - Add libperf-debuginfo subpackage (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes --- diff --git a/Makefile.rhelver b/Makefile.rhelver index 23c59cd..9826d97 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 = 50 +RHEL_RELEASE = 51 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 4407191..bc611bc 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3509,7 +3509,7 @@ CONFIG_MAX77620_THERMAL=m CONFIG_MAX77620_WATCHDOG=y # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 95d06b0..f32fd24 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3488,7 +3488,7 @@ CONFIG_MAX77620_THERMAL=m CONFIG_MAX77620_WATCHDOG=y # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 80076ec..95a9247 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3505,7 +3505,7 @@ CONFIG_MAX77620_THERMAL=m CONFIG_MAX77620_WATCHDOG=y # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index ceb4432..5e9043d 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3484,7 +3484,7 @@ CONFIG_MAX77620_THERMAL=m CONFIG_MAX77620_WATCHDOG=y # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 617432d..746273b 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3545,7 +3545,7 @@ CONFIG_MAX77620_THERMAL=m CONFIG_MAX77620_WATCHDOG=y # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index b0a91b1..afaba35 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3524,7 +3524,7 @@ CONFIG_MAX77620_THERMAL=m CONFIG_MAX77620_WATCHDOG=y # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 713b24c..ec81faa 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3191,7 +3191,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 2744e20..917d358 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3171,7 +3171,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 4a80f53..afb08b7 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3175,7 +3175,7 @@ CONFIG_MARVELL_88Q2XXX_PHY=m # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m CONFIG_MAX_PHYSMEM_BITS=46 -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index a6f2484..d6c15bb 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3155,7 +3155,7 @@ CONFIG_MARVELL_88Q2XXX_PHY=m # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m CONFIG_MAX_PHYSMEM_BITS=46 -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index aa2aede..5b138fb 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3165,7 +3165,7 @@ CONFIG_MARVELL_88Q2XXX_PHY=m # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m CONFIG_MAX_PHYSMEM_BITS=46 -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 3844e3c..abf3cf7 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3368,7 +3368,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX9611 is not set # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 CONFIG_MAXSMP=y # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 2a98477..e723065 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3348,7 +3348,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX9611 is not set # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 CONFIG_MAXSMP=y # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index c14773b..7f86796 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3408,7 +3408,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX9611 is not set # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 CONFIG_MAXSMP=y # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 2f40d1b..ac993ba 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3388,7 +3388,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX9611 is not set # CONFIG_MAXIM_THERMOCOUPLE is not set CONFIG_MAXLINEAR_GPHY=m -CONFIG_MAX_SKB_FRAGS=45 +CONFIG_MAX_SKB_FRAGS=17 CONFIG_MAXSMP=y # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set diff --git a/kernel.changelog b/kernel.changelog index 4aa3372..2cf7209 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,12 @@ -* Tue Feb 27 2024 Fedora Kernel Team [6.8.0-0.rc6.45ec2f5f6ed3.50] +* Wed Feb 28 2024 Fedora Kernel Team [6.8.0-0.rc6.cf1182944c7c.51] +- Revert "net: bump CONFIG_MAX_SKB_FRAGS to 45" (Marcelo Ricardo Leitner) - Add libperf-debuginfo subpackage (Justin M. Forbes) Resolves: +* Wed Feb 28 2024 Fedora Kernel Team [6.8.0-0.rc6.cf1182944c7c.50] +- Linux v6.8.0-0.rc6.cf1182944c7c +Resolves: + * Tue Feb 27 2024 Fedora Kernel Team [6.8.0-0.rc6.45ec2f5f6ed3.49] - redhat/configs: Disable CONFIG_INFINIBAND_USNIC (Kamal Heib) - Enable CONFIG_BMI323_I2C=m for Fedora x86_64 builds (Hans de Goede) diff --git a/kernel.spec b/kernel.spec index 0e672b6..f8d93e3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc6.20240227git45ec2f5f6ed3.50 +%define pkgrelease 0.rc6.20240228gitcf1182944c7c.51 %define kversion 6 -%define tarfile_release 6.8-rc6-11-g45ec2f5f6ed3 +%define tarfile_release 6.8-rc6-21-gcf1182944c7c # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20240227git45ec2f5f6ed3.50%{?buildid}%{?dist} +%define specrelease 0.rc6.20240228gitcf1182944c7c.51%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -639,7 +639,7 @@ Name: %{package_name} License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause-Clear AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR Apache-2.0) AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib AND (copyleft-next-0.3.1 OR GPL-2.0-or-later) URL: https://www.kernel.org/ Version: %{specrpmversion} -Release: %{pkg_release}.1 +Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD %if 0%{?fedora} @@ -3865,12 +3865,13 @@ fi\ # # %changelog -* Tue Feb 27 2024 Jiri Vanek - 6.8.0-0.rc6.20240227git45ec2f5f6ed3.50.1 -- Rebuilt for java-21-openjdk as system jdk - -* Tue Feb 27 2024 Fedora Kernel Team [6.8.0-0.rc6.45ec2f5f6ed3.50] +* Wed Feb 28 2024 Fedora Kernel Team [6.8.0-0.rc6.cf1182944c7c.51] +- Revert "net: bump CONFIG_MAX_SKB_FRAGS to 45" (Marcelo Ricardo Leitner) - Add libperf-debuginfo subpackage (Justin M. Forbes) +* Wed Feb 28 2024 Fedora Kernel Team [6.8.0-0.rc6.cf1182944c7c.50] +- Linux v6.8.0-0.rc6.cf1182944c7c + * Tue Feb 27 2024 Fedora Kernel Team [6.8.0-0.rc6.45ec2f5f6ed3.49] - redhat/configs: Disable CONFIG_INFINIBAND_USNIC (Kamal Heib) - Enable CONFIG_BMI323_I2C=m for Fedora x86_64 builds (Hans de Goede) diff --git a/sources b/sources index f333d0b..a182024 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.8-rc6-11-g45ec2f5f6ed3.tar.xz) = afbd3ef46841d86bc8518f4a8f986f76ecbd2a44fa8decb37b9a959d3c841e9d1cf8a47ef970987087b049ac9dbc3e4003654ec8c9b9d984ba05ccab9166646c -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = 3dd43ff88c80b9e82fe8b928244e1b3283f4d4722f08c855057d963a75e3344eac2d1ebc2e0742162b792b76ce26a34582fa6ffcd16b1807cdc17aacb9730ee8 -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 5fc1bedc505130757046636f09a1a7976417ecf4b405c84ea962321e8bebb7384e7bd0abb520d67bf866d2fcd2220086ad4c30226e1705b7697f6dd97b653582 +SHA512 (linux-6.8-rc6-21-gcf1182944c7c.tar.xz) = 4e849dfad1eae9176110c8ec5885fda15cb61d885dbb9daa77611d0d2d850cbec392996754ee52ae798c17e6ef873320ff1816e146182ab574e5f98b14cc53ca +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = dc55b68f991a9e45aa2f71c67caf4c9243555d06e56f0e2b8be02ddccaf13a8b6fddf7bdc734354de795834df33bbc165b25a227d5ea7e8c0b29e3212845f5b4 +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 418af894e6c26a48a7ef2e87f5755a3135206a8e709cb035363b2789470f68429f336661d674f4233791f24c315d35036b72ecfeede337abf4d7a02604bb8fd9