diff options
-rw-r--r-- | SOURCES/Patchlist.changelog | 3 | ||||
-rw-r--r-- | SOURCES/kernel-x86_64-debug-fedora.config | 4 | ||||
-rw-r--r-- | SOURCES/kernel-x86_64-debug-rhel.config | 4 | ||||
-rw-r--r-- | SOURCES/kernel-x86_64-fedora.config | 4 | ||||
-rw-r--r-- | SOURCES/kernel-x86_64-rhel.config | 4 | ||||
-rw-r--r-- | SOURCES/kernel-x86_64-rt-debug-rhel.config | 4 | ||||
-rw-r--r-- | SOURCES/kernel-x86_64-rt-rhel.config | 4 | ||||
-rw-r--r-- | SOURCES/kernel.changelog | 6 | ||||
-rw-r--r-- | SOURCES/patch-6.10-redhat.patch | 22 | ||||
-rw-r--r-- | SPECS/kernel.spec | 17 |
10 files changed, 50 insertions, 22 deletions
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index f1b9625..faa5304 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/3b2f4b84968261c49a19cde5a2c01c32c09cc1f8 + 3b2f4b84968261c49a19cde5a2c01c32c09cc1f8 xfs: xfs_finobt_count_blocks() walks the wrong btree + https://gitlab.com/cki-project/kernel-ark/-/commit/378f837843ce9ccefbf401f707cda2c10c03b258 378f837843ce9ccefbf401f707cda2c10c03b258 Revert the F39 commits which should not have pushed diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config index b691f1b..d67dfc7 100644 --- a/SOURCES/kernel-x86_64-debug-fedora.config +++ b/SOURCES/kernel-x86_64-debug-fedora.config @@ -9052,6 +9052,8 @@ CONFIG_HID_APPLETB_BL=m CONFIG_HID_APPLETB_KBD=m CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m CONFIG_APPLE_BCE=m +CONFIG_HID_ASUS_ALLY=m +CONFIG_ASUS_ARMOURY=m CONFIG_LEGION_LAPTOP=m CONFIG_ACPI_CALL=m CONFIG_MFD_STEAMDECK=m @@ -9093,5 +9095,3 @@ CONFIG_SND_SOC_SOF_IPC3=y CONFIG_SND_SOC_SOF_INTEL_IPC4=y CONFIG_SND_SOC_SOF_AMD_COMMON=m CONFIG_SND_SOC_TOPOLOGY=y -CONFIG_HID_ASUS_ALLY=m -CONFIG_ASUS_ARMOURY=m diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index 210dddd..190f7fc 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -8033,6 +8033,8 @@ CONFIG_HID_APPLETB_BL=m CONFIG_HID_APPLETB_KBD=m CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m CONFIG_APPLE_BCE=m +CONFIG_HID_ASUS_ALLY=m +CONFIG_ASUS_ARMOURY=m CONFIG_LEGION_LAPTOP=m CONFIG_ACPI_CALL=m CONFIG_IIO_HRTIMER_TRIGGER=m @@ -8087,5 +8089,3 @@ CONFIG_SND_SOC_SOF_AMD_ACP63=m # CONFIG_SND_AMD_ASOC_REMBRANDT is not set # CONFIG_SND_SOC_AMD_LEGACY_MACH is not set CONFIG_SND_SOC_TOPOLOGY=y -CONFIG_HID_ASUS_ALLY=m -CONFIG_ASUS_ARMOURY=m diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index 713987a..45cb254 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -9022,6 +9022,8 @@ CONFIG_HID_APPLETB_BL=m CONFIG_HID_APPLETB_KBD=m CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m CONFIG_APPLE_BCE=m +CONFIG_HID_ASUS_ALLY=m +CONFIG_ASUS_ARMOURY=m CONFIG_LEGION_LAPTOP=m CONFIG_ACPI_CALL=m CONFIG_MFD_STEAMDECK=m @@ -9063,5 +9065,3 @@ CONFIG_SND_SOC_SOF_IPC3=y CONFIG_SND_SOC_SOF_INTEL_IPC4=y CONFIG_SND_SOC_SOF_AMD_COMMON=m CONFIG_SND_SOC_TOPOLOGY=y -CONFIG_HID_ASUS_ALLY=m -CONFIG_ASUS_ARMOURY=m diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index 1a5ab05..3e78e20 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -8009,6 +8009,8 @@ CONFIG_HID_APPLETB_BL=m CONFIG_HID_APPLETB_KBD=m CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m CONFIG_APPLE_BCE=m +CONFIG_HID_ASUS_ALLY=m +CONFIG_ASUS_ARMOURY=m CONFIG_LEGION_LAPTOP=m CONFIG_ACPI_CALL=m CONFIG_IIO_HRTIMER_TRIGGER=m @@ -8063,5 +8065,3 @@ CONFIG_SND_SOC_SOF_AMD_ACP63=m # CONFIG_SND_AMD_ASOC_REMBRANDT is not set # CONFIG_SND_SOC_AMD_LEGACY_MACH is not set CONFIG_SND_SOC_TOPOLOGY=y -CONFIG_HID_ASUS_ALLY=m -CONFIG_ASUS_ARMOURY=m diff --git a/SOURCES/kernel-x86_64-rt-debug-rhel.config b/SOURCES/kernel-x86_64-rt-debug-rhel.config index 1cb0a7f..033c113 100644 --- a/SOURCES/kernel-x86_64-rt-debug-rhel.config +++ b/SOURCES/kernel-x86_64-rt-debug-rhel.config @@ -8094,6 +8094,8 @@ CONFIG_HID_APPLETB_BL=m CONFIG_HID_APPLETB_KBD=m CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m CONFIG_APPLE_BCE=m +CONFIG_HID_ASUS_ALLY=m +CONFIG_ASUS_ARMOURY=m CONFIG_LEGION_LAPTOP=m CONFIG_ACPI_CALL=m CONFIG_IIO_HRTIMER_TRIGGER=m @@ -8148,5 +8150,3 @@ CONFIG_SND_SOC_SOF_AMD_ACP63=m # CONFIG_SND_AMD_ASOC_REMBRANDT is not set # CONFIG_SND_SOC_AMD_LEGACY_MACH is not set CONFIG_SND_SOC_TOPOLOGY=y -CONFIG_HID_ASUS_ALLY=m -CONFIG_ASUS_ARMOURY=m diff --git a/SOURCES/kernel-x86_64-rt-rhel.config b/SOURCES/kernel-x86_64-rt-rhel.config index b75bb3f..fc53795 100644 --- a/SOURCES/kernel-x86_64-rt-rhel.config +++ b/SOURCES/kernel-x86_64-rt-rhel.config @@ -8070,6 +8070,8 @@ CONFIG_HID_APPLETB_BL=m CONFIG_HID_APPLETB_KBD=m CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m CONFIG_APPLE_BCE=m +CONFIG_HID_ASUS_ALLY=m +CONFIG_ASUS_ARMOURY=m CONFIG_LEGION_LAPTOP=m CONFIG_ACPI_CALL=m CONFIG_IIO_HRTIMER_TRIGGER=m @@ -8124,5 +8126,3 @@ CONFIG_SND_SOC_SOF_AMD_ACP63=m # CONFIG_SND_AMD_ASOC_REMBRANDT is not set # CONFIG_SND_SOC_AMD_LEGACY_MACH is not set CONFIG_SND_SOC_TOPOLOGY=y -CONFIG_HID_ASUS_ALLY=m -CONFIG_ASUS_ARMOURY=m diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index f665727..31d659f 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/kernel.changelog @@ -1,3 +1,9 @@ +* Wed Sep 04 2024 Augusto Caringi <acaringi@redhat.com> [6.10.8-0] +- Add to BugsFixed (Augusto Caringi) +- xfs: xfs_finobt_count_blocks() walks the wrong btree (Dave Chinner) +- Linux v6.10.8 +Resolves: + * Thu Aug 29 2024 Augusto Caringi <acaringi@redhat.com> [6.10.7-0] - KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHPKEYR in sync (Shivaprasad G Bhat) - KVM: PPC: Book3S HV: Add one-reg interface for HASHPKEYR register (Shivaprasad G Bhat) diff --git a/SOURCES/patch-6.10-redhat.patch b/SOURCES/patch-6.10-redhat.patch index 3ef3fe6..86a5055 100644 --- a/SOURCES/patch-6.10-redhat.patch +++ b/SOURCES/patch-6.10-redhat.patch @@ -32,6 +32,7 @@ drivers/pci/quirks.c | 24 ++++ drivers/scsi/sd.c | 10 ++ drivers/usb/core/hub.c | 7 + + fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +- include/linux/crypto.h | 1 + include/linux/efi.h | 22 ++- include/linux/lsm_hook_defs.h | 2 + @@ -45,7 +46,7 @@ security/lockdown/Kconfig | 13 ++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 47 files changed, 827 insertions(+), 256 deletions(-) + 48 files changed, 828 insertions(+), 257 deletions(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index eec8df1dde06..88f49dd10cd0 100644 @@ -64,7 +65,7 @@ index eec8df1dde06..88f49dd10cd0 100644 ... PPC KVM_REG_PPC_TM_GPR31 64 diff --git a/Makefile b/Makefile -index ab77d171e268..c46aa8337181 100644 +index 2e5ac6ab3d47..838301b19917 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1693,7 +1694,7 @@ index 568410e64ce6..6afbaee83950 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 6b64af7d4927..a7ad470b8b8c 100644 +index 7d2a294ebc3d..c2536099932b 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -120,6 +120,14 @@ static const char *sd_cache_types[] = { @@ -1711,7 +1712,7 @@ index 6b64af7d4927..a7ad470b8b8c 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4253,6 +4261,8 @@ static int __init init_sd(void) +@@ -4255,6 +4263,8 @@ static int __init init_sd(void) goto err_out_class; } @@ -1738,6 +1739,19 @@ index 4b93c0bd1d4b..b98906237306 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/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c +index 42e9fd47f6c7..ffef1c75dd57 100644 +--- a/fs/xfs/libxfs/xfs_ialloc_btree.c ++++ b/fs/xfs/libxfs/xfs_ialloc_btree.c +@@ -749,7 +749,7 @@ xfs_finobt_count_blocks( + if (error) + return error; + +- cur = xfs_inobt_init_cursor(pag, tp, agbp); ++ cur = xfs_finobt_init_cursor(pag, tp, agbp); + error = xfs_btree_count_blocks(cur, tree_blocks); + xfs_btree_del_cursor(cur, error); + xfs_trans_brelse(tp, agbp); diff --git a/include/linux/crypto.h b/include/linux/crypto.h index b164da5e129e..59021b8609a7 100644 --- a/include/linux/crypto.h diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 2501276..ff6d004 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 %define buildid .fsync -%define specrpmversion 6.10.7 -%define specversion 6.10.7 +%define specrpmversion 6.10.8 +%define specversion 6.10.8 %define patchversion 6.10 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.10.7 +%define tarfile_release 6.10.8 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 201%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.10.7 +%define kabiversion 6.10.8 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4198,8 +4198,13 @@ fi\ # # %changelog -* Wed Sep 04 2024 Jan200101 <sentrycraft123@gmail.com> - 6.10.7-201.fsync -- kernel-fsync v6.10.7 +* Sat Sep 07 2024 Jan200101 <sentrycraft123@gmail.com> - 6.10.8-201.fsync +- kernel-fsync v6.10.8 + +* Wed Sep 04 2024 Augusto Caringi <acaringi@redhat.com> [6.10.8-0] +- Add to BugsFixed (Augusto Caringi) +- xfs: xfs_finobt_count_blocks() walks the wrong btree (Dave Chinner) +- Linux v6.10.8 * Thu Aug 29 2024 Augusto Caringi <acaringi@redhat.com> [6.10.7-0] - KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHPKEYR in sync (Shivaprasad G Bhat) |