diff --git a/Patchlist.changelog b/Patchlist.changelog index 96dab51c2..55bc793bc 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/993f8a0404b0a8ee5b210f2d5e1b43a9236ea1a9 + 993f8a0404b0a8ee5b210f2d5e1b43a9236ea1a9 fuse: revert back to __readahead_folio() for readahead + https://gitlab.com/cki-project/kernel-ark/-/commit/8f2b5543568a374301731a95b3b5ea3d6f70e89a 8f2b5543568a374301731a95b3b5ea3d6f70e89a mei: vsc: Use "wakeuphostint" when getting the host wakeup GPIO diff --git a/kernel.changelog b/kernel.changelog index 5764e96f9..bab612141 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,8 @@ +* Thu Feb 27 2025 Justin M. Forbes [6.13.5-0] +- fuse: revert back to __readahead_folio() for readahead (Joanne Koong) +- Linux v6.13.5 +Resolves: + * Sat Feb 22 2025 Justin M. Forbes [6.13.4-0] - Config update for 6.13.4 stable (Justin M. Forbes) - mei: vsc: Use "wakeuphostint" when getting the host wakeup GPIO (Hans de Goede) diff --git a/kernel.spec b/kernel.spec index c65e05390..e4a5f9ea1 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.13.4 -%define specversion 6.13.4 +%define specrpmversion 6.13.5 +%define specversion 6.13.5 %define patchversion 6.13 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.13.4 +%define tarfile_release 6.13.5 # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.13.4 +%define kabiversion 6.13.5 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4166,6 +4166,10 @@ fi\ # # %changelog +* Thu Feb 27 2025 Justin M. Forbes [6.13.5-0] +- fuse: revert back to __readahead_folio() for readahead (Joanne Koong) +- Linux v6.13.5 + * Sat Feb 22 2025 Justin M. Forbes [6.13.4-0] - Config update for 6.13.4 stable (Justin M. Forbes) - mei: vsc: Use "wakeuphostint" when getting the host wakeup GPIO (Hans de Goede) diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index f93420410..9031a60ef 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -55,6 +55,8 @@ drivers/pci/quirks.c | 24 + drivers/scsi/sd.c | 10 + drivers/usb/core/hub.c | 7 + + fs/fuse/dev.c | 6 + + fs/fuse/file.c | 13 +- include/linux/crypto.h | 2 + include/linux/efi.h | 22 +- include/linux/hid-over-i2c.h | 117 ++ @@ -68,7 +70,7 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 70 files changed, 9164 insertions(+), 277 deletions(-) + 72 files changed, 9181 insertions(+), 279 deletions(-) diff --git a/Documentation/hid/index.rst b/Documentation/hid/index.rst index af02cf7cfa82..baf156b44b58 100644 @@ -672,7 +674,7 @@ index 0fa7c5728f1e..e404279c8610 100644 M: Srinivas Pandruvada L: platform-driver-x86@vger.kernel.org diff --git a/Makefile b/Makefile -index c436a6e64971..1056b6318e7c 100644 +index 56d5c11b6f1e..351e5f119381 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -9531,6 +9533,55 @@ index 906daf423cb0..5e69805e1016 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/fuse/dev.c b/fs/fuse/dev.c +index 27ccae63495d..9ce6d1c6cac1 100644 +--- a/fs/fuse/dev.c ++++ b/fs/fuse/dev.c +@@ -836,6 +836,12 @@ static int fuse_check_folio(struct folio *folio) + return 0; + } + ++/* ++ * Attempt to steal a page from the splice() pipe and move it into the ++ * pagecache. If successful, the pointer in @pagep will be updated. The ++ * folio that was originally in @pagep will lose a reference and the new ++ * folio returned in @pagep will carry a reference. ++ */ + static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) + { + int err; +diff --git a/fs/fuse/file.c b/fs/fuse/file.c +index 7d92a5479998..d63e56fd3dd2 100644 +--- a/fs/fuse/file.c ++++ b/fs/fuse/file.c +@@ -955,8 +955,10 @@ static void fuse_readpages_end(struct fuse_mount *fm, struct fuse_args *args, + fuse_invalidate_atime(inode); + } + +- for (i = 0; i < ap->num_folios; i++) ++ for (i = 0; i < ap->num_folios; i++) { + folio_end_read(ap->folios[i], !err); ++ folio_put(ap->folios[i]); ++ } + if (ia->ff) + fuse_file_put(ia->ff, false); + +@@ -1048,7 +1050,14 @@ static void fuse_readahead(struct readahead_control *rac) + ap = &ia->ap; + + while (ap->num_folios < cur_pages) { +- folio = readahead_folio(rac); ++ /* ++ * This returns a folio with a ref held on it. ++ * The ref needs to be held until the request is ++ * completed, since the splice case (see ++ * fuse_try_move_page()) drops the ref after it's ++ * replaced in the page cache. ++ */ ++ folio = __readahead_folio(rac); + ap->folios[ap->num_folios] = folio; + ap->descs[ap->num_folios].length = folio_size(folio); + ap->num_folios++; diff --git a/include/linux/crypto.h b/include/linux/crypto.h index b164da5e129e..72bfb79b491d 100644 --- a/include/linux/crypto.h diff --git a/sources b/sources index daa6c92c0..6233b7819 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13.4.tar.xz) = ce4c354d3b6b9c71bea3012d31d68e5e8f573097f324ccad98891039cc2459597dcdedac943c718badfc62a5dd5c24886f0e3abf7232bd07f3588b969c00ffb3 -SHA512 (kernel-abi-stablelists-6.13.4.tar.xz) = cddd4974ad591b77fcd2d08d50314106258dad07b035347195966ed122c07ff54b0ddd31d314b679f8331e0a072ffca8a1c40d770e97ea9773860794d59b5d1a -SHA512 (kernel-kabi-dw-6.13.4.tar.xz) = 4d39a05dc3ac97ad4fdf03dfdbf3d350733ec2c567e724f03339efaee07bb4818b0bc26b01888b7cfe159332d28149838fedfaef3c7602e89b2855dd9db409bc +SHA512 (linux-6.13.5.tar.xz) = 8843d59f85a5943aefe45298587f89acae45020cbccd1de33054d6177462150bb17239be0b5bba6672d7c75ec617f81b2cec62230035f09c95bfb1a630027d4e +SHA512 (kernel-abi-stablelists-6.13.5.tar.xz) = dbf6ace029d8c93a6c5cb0787f258c5ab13cc21fad60ab8733bb2b53dcfa4c07aea695089b33307897622857d124fc480034980c54265a0870eb1531113fc512 +SHA512 (kernel-kabi-dw-6.13.5.tar.xz) = b5aa1914e0c27f604027114aa727d135185c7d254bb8a5bc5d3d4bfc5777b03748adf3e9bfefdece5d8ad913215c2f79c64f97207e411e4e359de4e41abb8a2f