From 560a110c53393ea8b6e513d87ee377f8bda1285b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 31 May 2025 01:07:08 +0200 Subject: [PATCH] linux6.12: update to 6.12.31. --- srcpkgs/linux6.12/files/arm64-dotconfig | 2 +- srcpkgs/linux6.12/files/i386-dotconfig | 2 +- srcpkgs/linux6.12/files/x86_64-dotconfig | 2 +- .../linux6.12/patches/fix-loop-mount-rw.patch | 38 ------------------- srcpkgs/linux6.12/template | 6 +-- 5 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/linux6.12/patches/fix-loop-mount-rw.patch diff --git a/srcpkgs/linux6.12/files/arm64-dotconfig b/srcpkgs/linux6.12/files/arm64-dotconfig index 04b64697a77..3033a2d2e90 100644 --- a/srcpkgs/linux6.12/files/arm64-dotconfig +++ b/srcpkgs/linux6.12/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.12.30 Kernel Configuration +# Linux/arm64 6.12.31 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 14.2.1 20250405" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.12/files/i386-dotconfig b/srcpkgs/linux6.12/files/i386-dotconfig index 0bd5a4cf3d2..9a076ad9f91 100644 --- a/srcpkgs/linux6.12/files/i386-dotconfig +++ b/srcpkgs/linux6.12/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.12.30 Kernel Configuration +# Linux/i386 6.12.31 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.12/files/x86_64-dotconfig b/srcpkgs/linux6.12/files/x86_64-dotconfig index e5504f804ce..69881762943 100644 --- a/srcpkgs/linux6.12/files/x86_64-dotconfig +++ b/srcpkgs/linux6.12/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.12.30 Kernel Configuration +# Linux/x86_64 6.12.31 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20250405" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.12/patches/fix-loop-mount-rw.patch b/srcpkgs/linux6.12/patches/fix-loop-mount-rw.patch deleted file mode 100644 index 253f13fc3dc..00000000000 --- a/srcpkgs/linux6.12/patches/fix-loop-mount-rw.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 355341e4359b2d5edf0ed5e117f7e9e7a0a5dac0 Mon Sep 17 00:00:00 2001 -From: Christoph Hellwig -Date: Tue, 20 May 2025 15:54:20 +0200 -Subject: loop: don't require ->write_iter for writable files in loop_configure - -Block devices can be opened read-write even if they can't be written to -for historic reasons. Remove the check requiring file->f_op->write_iter -when the block devices was opened in loop_configure. The call to -loop_check_backing_file just below ensures the ->write_iter is present -for backing files opened for writing, which is the only check that is -actually needed. - -Fixes: f5c84eff634b ("loop: Add sanity check for read/write_iter") -Reported-by: Christian Hesse -Signed-off-by: Christoph Hellwig -Link: https://lore.kernel.org/r/20250520135420.1177312-1-hch@lst.de -Signed-off-by: Jens Axboe ---- - drivers/block/loop.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index b8ba7de0875395..e2b1f377f58563 100644 ---- a/drivers/block/loop.c -+++ b/drivers/block/loop.c -@@ -979,9 +979,6 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, - if (!file) - return -EBADF; - -- if ((mode & BLK_OPEN_WRITE) && !file->f_op->write_iter) -- return -EINVAL; -- - error = loop_check_backing_file(file); - if (error) - return error; --- -cgit 1.2.3-korg - diff --git a/srcpkgs/linux6.12/template b/srcpkgs/linux6.12/template index 6b31dddeed9..6d2a7d85096 100644 --- a/srcpkgs/linux6.12/template +++ b/srcpkgs/linux6.12/template @@ -1,7 +1,7 @@ # Template file for 'linux6.12' pkgname=linux6.12 -version=6.12.30 -revision=2 +version=6.12.31 +revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Duncaen " license="GPL-2.0-only" @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb - e3495b1de2da5ad99fefc4bce85de081753b8ff0a1c5d978d2f5c964037c30a5" + b170114443fe011f4c36a1cd1da35a500ce28628625284c8ee0e52f9e9e3b475" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR.