[packages/kernel] Switch aufs to 6.15 branch
arekm
arekm at pld-linux.org
Thu Jun 12 17:43:39 CEST 2025
commit b5b21062518b8e0097b52b25e50d3ceb1682b21a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Jun 12 17:15:26 2025 +0200
Switch aufs to 6.15 branch
kernel-aufs.patch | 64 +++++++++++++++++++++++++++----------------------------
update-source.sh | 4 ++--
2 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index 5c2de9a6..62933e62 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -1,5 +1,5 @@
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN kbuild patch
+aufs6.15 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index 5b4847bd2fbb5..74a618a3694fb 100644
@@ -23,10 +23,10 @@ index 77fd7f7b5d024..8a7485aad338b 100644
obj-$(CONFIG_BPF_LSM) += bpf_fs_kfuncs.o
+obj-$(CONFIG_AUFS_FS) += aufs/
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN base patch
+aufs6.15 base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index d48dd6726fe6b..d8e852d7bea92 100644
+index dd844ac8d9107..845564059a505 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3870,6 +3870,19 @@ S: Supported
@@ -50,7 +50,7 @@ index d48dd6726fe6b..d8e852d7bea92 100644
M: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
R: Dave Ertman <david.m.ertman at intel.com>
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index b8ba7de087539..25337d8591aa3 100644
+index e2b1f377f5856..ea328c8498c53 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -617,6 +617,26 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -156,7 +156,7 @@ index 4d6df083e0c06..73cd917c821fe 100644
{
if (unlikely(!out->f_op->splice_write))
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 016b0fe1536e3..fed72def0eb0b 100644
+index a4fd649e2c3fc..b5505b712998a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1211,6 +1211,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -243,7 +243,7 @@ index 58d78a33ac65b..2dbd6fe56413c 100644
#ifdef CONFIG_LOCK_STAT
static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN mmap patch
+aufs6.15 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
index b0d4e1908b22f..312a7d32aa9c0 100644
@@ -324,7 +324,7 @@ index bce6745330003..b12b5a75c799c 100644
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index bf55206935c46..1ded10c638970 100644
+index fdda6b16263b3..62034da6a7b13 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2578,6 +2578,54 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -654,7 +654,7 @@ index 0000000000000..b034d160a18f4
+}
+#endif /* !CONFIG_MMU */
diff --git a/mm/vma.c b/mm/vma.c
-index 839d12f02c885..a4076eb9d1c21 100644
+index a468d4c29c0cd..aef6d4781baa1 100644
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -345,7 +345,7 @@ static void vma_complete(struct vma_prepare *vp, struct vma_iterator *vmi,
@@ -693,7 +693,7 @@ index 839d12f02c885..a4076eb9d1c21 100644
if (new_vma->vm_ops && new_vma->vm_ops->open)
new_vma->vm_ops->open(new_vma);
if (vma_link(mm, new_vma))
-@@ -1837,7 +1837,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -1838,7 +1838,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
vma_close(new_vma);
if (new_vma->vm_file)
@@ -703,7 +703,7 @@ index 839d12f02c885..a4076eb9d1c21 100644
unlink_anon_vmas(new_vma);
out_free_mempol:
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN standalone patch
+aufs6.15 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
index f27934816c452..d711c216bd070 100644
@@ -4803,7 +4803,7 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
+-include ${srctree}/${src}/conf_priv.mk
diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
--- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2025-05-26 10:00:00.856622052 +0200
++++ linux/fs/aufs/cpup.c 2025-06-12 17:13:39.183320207 +0200
@@ -0,0 +1,1466 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -6378,7 +6378,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
+#endif /* __AUFS_CPUP_H__ */
diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
--- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c 2025-05-18 21:20:02.399971589 +0200
++++ linux/fs/aufs/dbgaufs.c 2025-06-12 17:13:39.183320207 +0200
@@ -0,0 +1,525 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -8018,7 +8018,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
+#endif /* __AUFS_DEBUG_H__ */
diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
--- /usr/share/empty/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c 2025-05-18 21:20:02.399971589 +0200
++++ linux/fs/aufs/dentry.c 2025-06-12 17:13:39.186653540 +0200
@@ -0,0 +1,1228 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -19972,7 +19972,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2025-05-26 10:00:00.859955385 +0200
++++ linux/fs/aufs/inode.h 2025-06-12 17:13:39.186653540 +0200
@@ -0,0 +1,727 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -20927,7 +20927,7 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
+#endif
diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
--- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c 2025-05-26 10:00:00.859955385 +0200
++++ linux/fs/aufs/i_op_add.c 2025-06-12 17:13:39.186653540 +0200
@@ -0,0 +1,979 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -21910,7 +21910,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2025-05-18 21:20:02.399971589 +0200
++++ linux/fs/aufs/i_op.c 2025-06-12 17:13:39.186653540 +0200
@@ -0,0 +1,1522 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -25872,7 +25872,7 @@ diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
+endif
diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
--- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile 2025-05-26 10:00:00.856622052 +0200
++++ linux/fs/aufs/Makefile 2025-06-12 17:13:39.183320207 +0200
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -30066,7 +30066,7 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
--- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c 2025-05-18 21:20:02.399971589 +0200
++++ linux/fs/aufs/super.c 2025-06-12 17:13:39.186653540 +0200
@@ -0,0 +1,872 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -33207,7 +33207,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2025-05-26 10:00:00.859955385 +0200
++++ linux/fs/aufs/vfsub.c 2025-06-12 17:13:39.186653540 +0200
@@ -0,0 +1,971 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -34182,7 +34182,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2025-05-26 10:00:00.859955385 +0200
++++ linux/fs/aufs/vfsub.h 2025-06-12 17:13:39.186653540 +0200
@@ -0,0 +1,441 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -34627,7 +34627,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2025-05-26 10:00:00.859955385 +0200
++++ linux/fs/aufs/wbr_policy.c 2025-06-12 17:13:39.186653540 +0200
@@ -0,0 +1,835 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -35466,7 +35466,7 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
+};
diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2025-05-26 10:00:00.859955385 +0200
++++ linux/fs/aufs/whout.c 2025-06-12 17:13:39.189986873 +0200
@@ -0,0 +1,1096 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -39418,7 +39418,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
+}
diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h 2025-05-26 10:00:01.996622052 +0200
++++ linux/include/uapi/linux/aufs_type.h 2025-06-12 17:13:39.189986873 +0200
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
@@ -39462,7 +39462,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+#include <limits.h>
+#endif /* __KERNEL__ */
+
-+#define AUFS_VERSION "6.x-rcN-20250526"
++#define AUFS_VERSION "6.15-20250602"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39873,10 +39873,10 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+
+#endif /* __AUFS_TYPE_H__ */
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN loopback patch
+aufs6.15 loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 25337d8591aa3..3eafdc162f149 100644
+index ea328c8498c53..a16d0b2d74f35 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -52,7 +52,7 @@ struct loop_device {
@@ -39968,7 +39968,7 @@ index 25337d8591aa3..3eafdc162f149 100644
struct queue_limits lim;
int error;
loff_t size;
-@@ -1011,6 +1037,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1008,6 +1034,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
/* This is safe, since we have a reference from open(). */
__module_get(THIS_MODULE);
@@ -39982,7 +39982,7 @@ index 25337d8591aa3..3eafdc162f149 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
* here to avoid changing device under exclusive owner.
-@@ -1065,6 +1098,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1062,6 +1095,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
lo->lo_device = bdev;
loop_assign_backing_file(lo, file);
@@ -39990,7 +39990,7 @@ index 25337d8591aa3..3eafdc162f149 100644
lim = queue_limits_start_update(lo->lo_queue);
loop_update_limits(lo, &lim, config->block_size);
-@@ -1115,6 +1149,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1112,6 +1146,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
bd_abort_claiming(bdev, loop_configure);
out_putf:
fput(file);
@@ -39999,7 +39999,7 @@ index 25337d8591aa3..3eafdc162f149 100644
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
return error;
-@@ -1124,11 +1160,13 @@ static void __loop_clr_fd(struct loop_device *lo)
+@@ -1121,11 +1157,13 @@ static void __loop_clr_fd(struct loop_device *lo)
{
struct queue_limits lim;
struct file *filp;
@@ -40013,7 +40013,7 @@ index 25337d8591aa3..3eafdc162f149 100644
spin_unlock_irq(&lo->lo_lock);
lo->lo_device = NULL;
-@@ -1195,6 +1233,8 @@ static void __loop_clr_fd(struct loop_device *lo)
+@@ -1192,6 +1230,8 @@ static void __loop_clr_fd(struct loop_device *lo)
* fput can take open_mutex which is usually taken before lo_mutex.
*/
fput(filp);
@@ -40098,7 +40098,7 @@ index e867aa6e757a6..4a4f96e294315 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index fed72def0eb0b..6fd0521854c0c 100644
+index b5505b712998a..d6f09e38145af 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2319,6 +2319,11 @@ struct super_operations {
diff --git a/update-source.sh b/update-source.sh
index 8b213675..65104891 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -1,8 +1,8 @@
#!/bin/sh
set -xe
-#BRANCH=aufs6.14
-BRANCH=aufs6.x-rcN
+BRANCH=aufs6.15
+#BRANCH=aufs6.x-rcN
# aufs6
[ -d aufs-standalone ] || git clone https://github.com/sfjro/aufs-standalone.git
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/b5b21062518b8e0097b52b25e50d3ceb1682b21a
More information about the pld-cvs-commit
mailing list