From 68cff956c779f687d2f8cc45f32d023ddb194657 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 20 Aug 2025 12:14:32 -0600 Subject: [PATCH] kernel-6.15.11-100 * Wed Aug 20 2025 Justin M. Forbes [6.15.11-0] - Config updates for stable backports (Justin M. Forbes) - Linux v6.15.11 Resolves: Signed-off-by: Justin M. Forbes --- kernel-aarch64-16k-debug-fedora.config | 2 + kernel-aarch64-16k-fedora.config | 2 + kernel-aarch64-debug-fedora.config | 2 + kernel-aarch64-fedora.config | 2 + kernel-aarch64-rt-64k-debug-fedora.config | 2 + kernel-aarch64-rt-64k-fedora.config | 2 + kernel-aarch64-rt-debug-fedora.config | 2 + kernel-aarch64-rt-fedora.config | 2 + kernel.changelog | 5 ++ kernel.spec | 12 ++- patch-6.15-redhat.patch | 90 ++--------------------- sources | 6 +- 12 files changed, 40 insertions(+), 89 deletions(-) diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index e42c259d5..6b33d01bf 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -6957,6 +6957,8 @@ CONFIG_RENESAS_RZV2HWDT=m # CONFIG_RENESAS_USB_DMAC is not set # CONFIG_RENESAS_WDT is not set # CONFIG_RESET_ATTACK_MITIGATION is not set +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_BRCMSTB=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=m CONFIG_RESET_HISI=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 4bd783d39..868c1431b 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6928,6 +6928,8 @@ CONFIG_RENESAS_RZV2HWDT=m # CONFIG_RENESAS_USB_DMAC is not set # CONFIG_RENESAS_WDT is not set # CONFIG_RESET_ATTACK_MITIGATION is not set +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_BRCMSTB=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=m CONFIG_RESET_HISI=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 84801cd43..f5d545dd5 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6956,6 +6956,8 @@ CONFIG_RENESAS_RZV2HWDT=m # CONFIG_RENESAS_USB_DMAC is not set # CONFIG_RENESAS_WDT is not set # CONFIG_RESET_ATTACK_MITIGATION is not set +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_BRCMSTB=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=m CONFIG_RESET_HISI=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 201558da8..34adfe538 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6927,6 +6927,8 @@ CONFIG_RENESAS_RZV2HWDT=m # CONFIG_RENESAS_USB_DMAC is not set # CONFIG_RENESAS_WDT is not set # CONFIG_RESET_ATTACK_MITIGATION is not set +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_BRCMSTB=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=m CONFIG_RESET_HISI=y diff --git a/kernel-aarch64-rt-64k-debug-fedora.config b/kernel-aarch64-rt-64k-debug-fedora.config index ff9cde285..1cdea2527 100644 --- a/kernel-aarch64-rt-64k-debug-fedora.config +++ b/kernel-aarch64-rt-64k-debug-fedora.config @@ -6968,6 +6968,8 @@ CONFIG_RENESAS_RZV2HWDT=m # CONFIG_RENESAS_USB_DMAC is not set # CONFIG_RENESAS_WDT is not set # CONFIG_RESET_ATTACK_MITIGATION is not set +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_BRCMSTB=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=m CONFIG_RESET_HISI=y diff --git a/kernel-aarch64-rt-64k-fedora.config b/kernel-aarch64-rt-64k-fedora.config index e2e2d934c..5bbfd7c51 100644 --- a/kernel-aarch64-rt-64k-fedora.config +++ b/kernel-aarch64-rt-64k-fedora.config @@ -6939,6 +6939,8 @@ CONFIG_RENESAS_RZV2HWDT=m # CONFIG_RENESAS_USB_DMAC is not set # CONFIG_RENESAS_WDT is not set # CONFIG_RESET_ATTACK_MITIGATION is not set +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_BRCMSTB=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=m CONFIG_RESET_HISI=y diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index cb2e2fb9e..6128b2678 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -6964,6 +6964,8 @@ CONFIG_RENESAS_RZV2HWDT=m # CONFIG_RENESAS_USB_DMAC is not set # CONFIG_RENESAS_WDT is not set # CONFIG_RESET_ATTACK_MITIGATION is not set +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_BRCMSTB=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=m CONFIG_RESET_HISI=y diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index 3f2cad75b..7c5e7a574 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -6935,6 +6935,8 @@ CONFIG_RENESAS_RZV2HWDT=m # CONFIG_RENESAS_USB_DMAC is not set # CONFIG_RENESAS_WDT is not set # CONFIG_RESET_ATTACK_MITIGATION is not set +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_BRCMSTB=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_GPIO=m CONFIG_RESET_HISI=y diff --git a/kernel.changelog b/kernel.changelog index a209fc30e..884358b15 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,8 @@ +* Wed Aug 20 2025 Justin M. Forbes [6.15.11-0] +- Config updates for stable backports (Justin M. Forbes) +- Linux v6.15.11 +Resolves: + * Fri Aug 15 2025 Justin M. Forbes [6.15.10-0] - Enable CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL (Justin M. Forbes) - Disable NOVA_CORE (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index d4b633574..18c78a1b9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -159,18 +159,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.15.10 -%define specversion 6.15.10 +%define specrpmversion 6.15.11 +%define specversion 6.15.11 %define patchversion 6.15 %define pkgrelease 100 %define kversion 6 -%define tarfile_release 6.15.10 +%define tarfile_release 6.15.11 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 100%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.15.10 +%define kabiversion 6.15.11 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4261,6 +4261,10 @@ fi\ # # %changelog +* Wed Aug 20 2025 Justin M. Forbes [6.15.11-0] +- Config updates for stable backports (Justin M. Forbes) +- Linux v6.15.11 + * Fri Aug 15 2025 Justin M. Forbes [6.15.10-0] - Enable CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL (Justin M. Forbes) - Disable NOVA_CORE (Justin M. Forbes) diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index 2fcf0d0c2..eeb12223a 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -45,7 +45,6 @@ .../platform/x86/intel/int3472/discrete_quirks.c | 22 + drivers/scsi/sd.c | 10 + drivers/usb/core/hub.c | 7 + - fs/btrfs/tree-log.c | 45 +- include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 1 + include/linux/rmi.h | 1 + @@ -56,7 +55,7 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 58 files changed, 2772 insertions(+), 357 deletions(-) + 57 files changed, 2743 insertions(+), 341 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index dd844ac8d910..dab2b4892122 100644 @@ -87,7 +86,7 @@ index dd844ac8d910..dab2b4892122 100644 M: Jimmy Su L: linux-media@vger.kernel.org diff --git a/Makefile b/Makefile -index 7831d9cd2e6c..5bf8d4919df8 100644 +index 3a9650df9bb9..7e984c282ef7 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -578,10 +577,10 @@ index fb1fe9f3b1a3..5a3312fc0ea0 100644 acpi_dev_get_resources(device, &resource_list, acpi_check_serial_bus_slave, diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index 22afa4ff860d..78eacccaa1ae 100644 +index 9b5b1e4c7148..595f0933771e 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c -@@ -730,6 +730,24 @@ int ahci_stop_engine(struct ata_port *ap) +@@ -731,6 +731,24 @@ int ahci_stop_engine(struct ata_port *ap) tmp &= ~PORT_CMD_START; writel(tmp, port_mmio + PORT_CMD); @@ -633,7 +632,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index 6047c9600e03..bc6063090639 100644 +index 808d0d213509..8051c502d8e9 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -3343,10 +3342,10 @@ index 261f52b327e8..b768799221c4 100644 /* Device index used to identify the devices in a group. * diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h -index f5f1ec796f7c..e0687fb113de 100644 +index 4cff5e42eb34..7ae0c7b1a52f 100644 --- a/drivers/net/wireless/ath/ath12k/core.h +++ b/drivers/net/wireless/ath/ath12k/core.h -@@ -1061,6 +1061,7 @@ struct ath12k_base { +@@ -1065,6 +1065,7 @@ struct ath12k_base { size_t m3_len; DECLARE_BITMAP(fw_features, ATH12K_FW_FEATURE_COUNT); @@ -3354,7 +3353,7 @@ index f5f1ec796f7c..e0687fb113de 100644 } fw; const struct hal_rx_ops *hal_rx_ops; -@@ -1098,6 +1099,9 @@ struct ath12k_base { +@@ -1102,6 +1103,9 @@ struct ath12k_base { enum ath12k_firmware_mode fw_mode; struct ath12k_ftm_event_obj ftm_event_obj; @@ -4061,79 +4060,6 @@ index 1e0be266e9b2..d5ff94117e0b 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); -diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c -index e05140ce95be..2fb9e7bfc907 100644 ---- a/fs/btrfs/tree-log.c -+++ b/fs/btrfs/tree-log.c -@@ -321,8 +321,7 @@ struct walk_control { - - /* - * Ignore any items from the inode currently being processed. Needs -- * to be set every time we find a BTRFS_INODE_ITEM_KEY and we are in -- * the LOG_WALK_REPLAY_INODES stage. -+ * to be set every time we find a BTRFS_INODE_ITEM_KEY. - */ - bool ignore_cur_inode; - -@@ -2410,23 +2409,30 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb, - - nritems = btrfs_header_nritems(eb); - for (i = 0; i < nritems; i++) { -- btrfs_item_key_to_cpu(eb, &key, i); -+ struct btrfs_inode_item *inode_item; - -- /* inode keys are done during the first stage */ -- if (key.type == BTRFS_INODE_ITEM_KEY && -- wc->stage == LOG_WALK_REPLAY_INODES) { -- struct btrfs_inode_item *inode_item; -- u32 mode; -+ btrfs_item_key_to_cpu(eb, &key, i); - -- inode_item = btrfs_item_ptr(eb, i, -- struct btrfs_inode_item); -+ if (key.type == BTRFS_INODE_ITEM_KEY) { -+ inode_item = btrfs_item_ptr(eb, i, struct btrfs_inode_item); - /* -- * If we have a tmpfile (O_TMPFILE) that got fsync'ed -- * and never got linked before the fsync, skip it, as -- * replaying it is pointless since it would be deleted -- * later. We skip logging tmpfiles, but it's always -- * possible we are replaying a log created with a kernel -- * that used to log tmpfiles. -+ * An inode with no links is either: -+ * -+ * 1) A tmpfile (O_TMPFILE) that got fsync'ed and never -+ * got linked before the fsync, skip it, as replaying -+ * it is pointless since it would be deleted later. -+ * We skip logging tmpfiles, but it's always possible -+ * we are replaying a log created with a kernel that -+ * used to log tmpfiles; -+ * -+ * 2) A non-tmpfile which got its last link deleted -+ * while holding an open fd on it and later got -+ * fsynced through that fd. We always log the -+ * parent inodes when inode->last_unlink_trans is -+ * set to the current transaction, so ignore all the -+ * inode items for this inode. We will delete the -+ * inode when processing the parent directory with -+ * replay_dir_deletes(). - */ - if (btrfs_inode_nlink(eb, inode_item) == 0) { - wc->ignore_cur_inode = true; -@@ -2434,6 +2440,13 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb, - } else { - wc->ignore_cur_inode = false; - } -+ } -+ -+ /* Inode keys are done during the first stage. */ -+ if (key.type == BTRFS_INODE_ITEM_KEY && -+ wc->stage == LOG_WALK_REPLAY_INODES) { -+ u32 mode; -+ - ret = replay_xattr_deletes(wc->trans, root, log, - path, key.objectid); - if (ret) diff --git a/include/linux/efi.h b/include/linux/efi.h index 7d63d1d75f22..c7481fdedbdd 100644 --- a/include/linux/efi.h diff --git a/sources b/sources index 665505080..13b326e37 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15.10.tar.xz) = 12fe4ee7bafe1d9dbda9baeeffe572e1e67f51e811be3537c855272f10f8f0d99a4aad7b1ee533951f321066527bfcbf2dffed51c68dfbd84f6b4621c387526e -SHA512 (kernel-abi-stablelists-6.15.10.tar.xz) = 6458d5e3f9d5db54427ee525297fed5c35842e307d234f494b463032ee98e3fa7743f5d9dcc1f89269ca73fb893215a2e7ae5e89a4355e265280902f0d6ed6f1 -SHA512 (kernel-kabi-dw-6.15.10.tar.xz) = fb9d392120a5e201ba21f9a488019313345e1e47c4bf0783daec2128a189d25698be7f9d0fb37d39e443f32cc3bc8822831fe370db2581d8506e82d506a07024 +SHA512 (linux-6.15.11.tar.xz) = 09340eaea4786a2e515f483f70908b0979b14585ad68551cec406b088561d697aa70584b1905a973f5d44c128aa37675e50fdcf635c4a74566382fa0b8b4f993 +SHA512 (kernel-abi-stablelists-6.15.11.tar.xz) = 8e59aa2bba2dbc35db4a695506dd0cd279bb940b15a6eb30eb21d90b82163469f4766508661ffd5a079254508ce5bf2ba0f3ade5f0bbe405c2d7f95cd7936dd8 +SHA512 (kernel-kabi-dw-6.15.11.tar.xz) = e559513aba64a843dbb7b347ad54d1333bd57714451fd249615e8007fa9da446d5a7815431a4e56f5c723ad40a9bdb7a5ef9b3baa61945bf5e01eec3ec028538