From c092096ef4efc88efe2d96bf8afc006b6c630a77 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 7 Jun 2024 07:31:14 -0500 Subject: [PATCH] kernel-6.10.0-0.rc2.20240607git8a92980606e3.28 * Fri Jun 07 2024 Fedora Kernel Team [6.10.0-0.rc2.8a92980606e3.28] - Linux v6.10.0-0.rc2.8a92980606e3 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 4 ++++ kernel.spec | 12 ++++++------ patch-6.10-redhat.patch | 12 ++++++------ sources | 6 +++--- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 5e0fdae4a..ae6229694 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 = 27 +RHEL_RELEASE = 28 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 624c2ca99..14fc38116 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Fri Jun 07 2024 Fedora Kernel Team [6.10.0-0.rc2.8a92980606e3.28] +- Linux v6.10.0-0.rc2.8a92980606e3 +Resolves: + * Thu Jun 06 2024 Fedora Kernel Team [6.10.0-0.rc2.2df0193e62cf.27] - redhat: add missing UKI_secureboot_cert hunk (Patrick Talbert) - Linux v6.10.0-0.rc2.2df0193e62cf diff --git a/kernel.spec b/kernel.spec index dbf999471..393f3e6b0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc2.20240606git2df0193e62cf.27 +%define pkgrelease 0.rc2.20240607git8a92980606e3.28 %define kversion 6 -%define tarfile_release 6.10-rc2-97-g2df0193e62cf +%define tarfile_release 6.10-rc2-235-g8a92980606e3 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20240606git2df0193e62cf.27%{?buildid}%{?dist} +%define specrelease 0.rc2.20240607git8a92980606e3.28%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.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-2-Clause OR Apache-2.0) 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} @@ -4018,8 +4018,8 @@ fi\ # # %changelog -* Fri Jun 07 2024 Python Maint - 6.10.0-0.rc2.20240606git2df0193e62cf.27.1 -- Rebuilt for Python 3.13 +* Fri Jun 07 2024 Fedora Kernel Team [6.10.0-0.rc2.8a92980606e3.28] +- Linux v6.10.0-0.rc2.8a92980606e3 * Thu Jun 06 2024 Fedora Kernel Team [6.10.0-0.rc2.2df0193e62cf.27] - redhat: add missing UKI_secureboot_cert hunk (Patrick Talbert) diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index 46e7ecbfe..c76b8b852 100644 --- a/patch-6.10-redhat.patch +++ b/patch-6.10-redhat.patch @@ -2087,7 +2087,7 @@ index 88acefbf9aea..bf57fd3b9263 100644 /* Fusion */ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -index 89ef43a5ef86..7d8dd062e718 100644 +index 12d08d8ba538..6717350768e4 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -12598,6 +12598,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) @@ -2450,10 +2450,10 @@ index 6717b15e798c..8e1d3eae1686 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index fb004fd4e889..985984c6fd65 100644 +index cafc5ab1cbcb..632f4e84de19 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1620,6 +1620,7 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1618,6 +1618,7 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); @@ -2461,7 +2461,7 @@ index fb004fd4e889..985984c6fd65 100644 int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass); -@@ -2666,6 +2667,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) +@@ -2664,6 +2665,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) return false; } @@ -3149,7 +3149,7 @@ index 3c13240dfc9f..61b2ac156a3e 100644 obj-$(CONFIG_MULTIUSER) += groups.o obj-$(CONFIG_VHOST_TASK) += vhost_task.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 2222c3ff88e7..ad54d43bd078 100644 +index f45ed6adc092..3ff4cb164ddd 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ @@ -3184,7 +3184,7 @@ index 2222c3ff88e7..ad54d43bd078 100644 int sysctl_unprivileged_bpf_disabled __read_mostly = IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; -@@ -6010,6 +6028,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, +@@ -6011,6 +6029,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, if (write && !ret) { if (locked_state && unpriv_enable != 1) return -EPERM; diff --git a/sources b/sources index 7cd2be1e4..4c7304797 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.10-rc2-97-g2df0193e62cf.tar.xz) = f60a5973c1fdc3c0f95fd1bdad805474e3dee65140fa594c473e4732648a4d3c3a8801c336f6d48cb1c34983669b23f0934a51aec77bd459069e01506e247434 -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 8062e8ef9b1033cf0312c5006da4387e6cad3e606168004e3cd9e107672d14d820d78ebc21050d536ba1210327c21b52023a3b2176d82d1da67d4b3739e97a8c -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 24acf9e4cfc695461a63596a2a86bcaf420cdf3deefa4323de36263f67c4a08cdfea4b5d3c66303b265e5359ae629a9b46aee143bdc4cf4077fbbefeb2498ca3 +SHA512 (linux-6.10-rc2-235-g8a92980606e3.tar.xz) = b38cbfa186911b56d0d32d576bd204008872a154bd1ee060c2b519652a5afb6790399c90d139b2e3fa07ea1e403b8799642615f2ebd417ed8d1ab720c0670932 +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = ffe44c1d132c77159e9433d6e974c7afe5801147460ccc3eae65e4eaf9380ddef8af8a3a5a56caa7260d261c7141afc37ee5086a9b8487c43e45a05df1e8e1eb +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 796507a76f39ee12f27bba9cf1b0d2c3bc8ba86ecac8c20c88d0a90a92cc5adf8ccf77481c79e4771251e4b2fd4bde207b2d3c262a850d8ef30234f521a2df7e