diff --git a/kernel/tools/perf/files/patches/aufs6/aufs6-base.patch b/kernel/tools/perf/files/patches/aufs6/aufs6-base.patch index 24983178a6..a3b95c56e3 100644 --- a/kernel/tools/perf/files/patches/aufs6/aufs6-base.patch +++ b/kernel/tools/perf/files/patches/aufs6/aufs6-base.patch @@ -101,23 +101,6 @@ index 22dd9dcce7ecc..460791727fd9c 100644 if (error) return error; -diff --git a/fs/namespace.c b/fs/namespace.c -index d26f5e6d2ca35..85739e2d64c00 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -966,6 +966,12 @@ static inline int check_mnt(struct mount *mnt) - return mnt->mnt_ns == current->nsproxy->mnt_ns; - } - -+/* for aufs, CONFIG_AUFS_BR_FUSE */ -+int is_current_mnt_ns(struct vfsmount *mnt) -+{ -+ return check_mnt(real_mount(mnt)); -+} -+ - /* - * vfsmount lock must be held for write - */ diff --git a/fs/splice.c b/fs/splice.c index 06232d7e505f6..b15fd6073b6d3 100644 --- a/fs/splice.c @@ -165,7 +148,7 @@ index 217f7abf2cbfa..0e17b8c23f105 100644 * Acquire a lock. * diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h -index 70b366b648160..08cfdabb2721f 100644 +index 70b366b648160..05bc01c0f38af 100644 --- a/include/linux/mnt_namespace.h +++ b/include/linux/mnt_namespace.h @@ -10,6 +10,7 @@ struct mnt_namespace; @@ -176,15 +159,6 @@ index 70b366b648160..08cfdabb2721f 100644 extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, struct user_namespace *, struct fs_struct *); -@@ -17,6 +18,8 @@ extern void put_mnt_ns(struct mnt_namespace *ns); - DEFINE_FREE(put_mnt_ns, struct mnt_namespace *, if (!IS_ERR_OR_NULL(_T)) put_mnt_ns(_T)) - extern struct ns_common *from_mnt_ns(struct mnt_namespace *); - -+extern int is_current_mnt_ns(struct vfsmount *mnt); -+ - extern const struct file_operations proc_mounts_operations; - extern const struct file_operations proc_mountinfo_operations; - extern const struct file_operations proc_mountstats_operations; diff --git a/include/linux/splice.h b/include/linux/splice.h index 9dec4861d09f6..14583d8468640 100644 --- a/include/linux/splice.h diff --git a/kernel/tools/perf/files/patches/aufs6/aufs6-mmap.patch b/kernel/tools/perf/files/patches/aufs6/aufs6-mmap.patch index e1d9ac1077..11fc0b3509 100644 --- a/kernel/tools/perf/files/patches/aufs6/aufs6-mmap.patch +++ b/kernel/tools/perf/files/patches/aufs6/aufs6-mmap.patch @@ -2,22 +2,25 @@ SPDX-License-Identifier: GPL-2.0 aufs6.12 mmap patch diff --git a/fs/Makefile b/fs/Makefile -index b2539712b80d0..8260694bb133a 100644 +index b2539712b80d0..4ba97a539035c 100644 --- a/fs/Makefile +++ b/fs/Makefile -@@ -16,6 +16,9 @@ obj-y := open.o read_write.o file_table.o super.o \ - stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \ +@@ -17,6 +17,12 @@ obj-y := open.o read_write.o file_table.o super.o \ fs_types.o fs_context.o fs_parser.o fsopen.o init.o \ kernel_read_file.o mnt_idmapping.o remap_range.o pidfs.o + ++# don't move au_mf.o to the bottom of this file, otherwise it will ++# conflict with aufs-kbuild.patch. +ifeq (${CONFIG_AUFS_FS},m) +obj-y += au_mf.o +endif - ++ obj-$(CONFIG_BUFFER_HEAD) += buffer.o mpage.o obj-$(CONFIG_PROC_FS) += proc_namespace.o + obj-$(CONFIG_LEGACY_DIRECT_IO) += direct-io.o diff --git a/fs/au_mf.c b/fs/au_mf.c new file mode 100644 -index 0000000000000..ee1ff03778b98 +index 0000000000000..aaf6a1f91f719 --- /dev/null +++ b/fs/au_mf.c @@ -0,0 +1,60 @@ @@ -32,10 +35,10 @@ index 0000000000000..ee1ff03778b98 +#if IS_MODULE(CONFIG_AUFS_FS) +/* + * This au_mf.c (aufs mmapped files) is for external AUFS module only, -+ * and statically linked to kernel. ++ * and au_mf.o is statically linked to kernel. + * See also $srctree/fs/Makefile. -+ * This linking may seem to be tricky. It is due to support the case when AUFS -+ * is configured as an external module, eg. VFS calls a function defined in the ++ * This linking may seem tricky. It is due to support the case when AUFS is ++ * configured as an external module, eg. VFS calls a function defined in the + * dynamic module. + */ +#else diff --git a/kernel/tools/perf/files/patches/aufs6/aufs6-standalone.patch b/kernel/tools/perf/files/patches/aufs6/aufs6-standalone.patch index 77d7f73d35..41d2c9d41b 100644 --- a/kernel/tools/perf/files/patches/aufs6/aufs6-standalone.patch +++ b/kernel/tools/perf/files/patches/aufs6/aufs6-standalone.patch @@ -58,18 +58,10 @@ index eed5ffad9997c..2f6bead424786 100644 /* * Variant of alloc_empty_file() that doesn't check and modify nr_files. diff --git a/fs/namespace.c b/fs/namespace.c -index 85739e2d64c00..8aa96de6c151e 100644 +index d26f5e6d2ca35..3839141eee029 100644 --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -971,6 +971,7 @@ int is_current_mnt_ns(struct vfsmount *mnt) - { - return check_mnt(real_mount(mnt)); - } -+EXPORT_SYMBOL_GPL(is_current_mnt_ns); - - /* - * vfsmount lock must be held for write -@@ -2200,6 +2201,7 @@ struct vfsmount *collect_mounts(const struct path *path) +@@ -2194,6 +2194,7 @@ struct vfsmount *collect_mounts(const struct path *path) return ERR_CAST(tree); return &tree->mnt; } @@ -77,7 +69,7 @@ index 85739e2d64c00..8aa96de6c151e 100644 static void free_mnt_ns(struct mnt_namespace *); static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *, bool); -@@ -2230,6 +2232,7 @@ void drop_collected_mounts(struct vfsmount *mnt) +@@ -2224,6 +2225,7 @@ void drop_collected_mounts(struct vfsmount *mnt) unlock_mount_hash(); namespace_unlock(); } @@ -85,7 +77,7 @@ index 85739e2d64c00..8aa96de6c151e 100644 bool has_locked_children(struct mount *mnt, struct dentry *dentry) { -@@ -2301,6 +2304,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, +@@ -2295,6 +2297,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, } return 0; } @@ -93,6 +85,14 @@ index 85739e2d64c00..8aa96de6c151e 100644 static void lock_mnt_tree(struct mount *mnt) { +@@ -5598,6 +5601,7 @@ bool our_mnt(struct vfsmount *mnt) + { + return check_mnt(real_mount(mnt)); + } ++EXPORT_SYMBOL_GPL(our_mnt); + + bool current_chrooted(void) + { diff --git a/fs/notify/group.c b/fs/notify/group.c index 18446b7b0d495..09138e0b8a6a5 100644 --- a/fs/notify/group.c diff --git a/kernel/tools/perf/files/patches/aufs6/aufs6.12-20260112.patch b/kernel/tools/perf/files/patches/aufs6/aufs6.12-20260223.patch similarity index 99% rename from kernel/tools/perf/files/patches/aufs6/aufs6.12-20260112.patch rename to kernel/tools/perf/files/patches/aufs6/aufs6.12-20260223.patch index 90a69c0664..dbcb9cbb4b 100644 --- a/kernel/tools/perf/files/patches/aufs6/aufs6.12-20260112.patch +++ b/kernel/tools/perf/files/patches/aufs6/aufs6.12-20260223.patch @@ -1,6 +1,6 @@ diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-6.12.30/Documentation/ABI/testing/debugfs-aufs --- /dev/null -+++ linux-6.12.30/Documentation/ABI/testing/debugfs-aufs 2026-01-22 12:14:10.998746517 +0300 ++++ linux-6.12.30/Documentation/ABI/testing/debugfs-aufs 2026-03-25 14:52:47.431348885 +0300 @@ -0,0 +1,55 @@ +What: /debug/aufs/si_/ +Date: March 2009 @@ -59,7 +59,7 @@ diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-6.12.30/Documentati + will be empty. About XINO files, see the aufs manual. diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-6.12.30/Documentation/ABI/testing/sysfs-aufs --- /dev/null -+++ linux-6.12.30/Documentation/ABI/testing/sysfs-aufs 2026-01-22 12:14:10.998746517 +0300 ++++ linux-6.12.30/Documentation/ABI/testing/sysfs-aufs 2026-03-25 14:52:47.431530892 +0300 @@ -0,0 +1,31 @@ +What: /sys/fs/aufs/si_/ +Date: March 2009 @@ -94,7 +94,7 @@ diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-6.12.30/Documentation + will be empty. About XINO files, see the aufs manual. diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-6.12.30/Documentation/filesystems/aufs/design/01intro.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/01intro.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/01intro.txt 2026-03-25 14:52:47.431933736 +0300 @@ -0,0 +1,171 @@ + +# Copyright (C) 2005-2025 Junjiro R. Okajima @@ -269,7 +269,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-6.12.30/ +about it. But currently I have implemented it in kernel space. diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-6.12.30/Documentation/filesystems/aufs/design/02struct.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/02struct.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/02struct.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,258 @@ + +# Copyright (C) 2005-2025 Junjiro R. Okajima @@ -531,7 +531,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-6.12.30 +For this purpose, use "aumvdown" command in aufs-util.git. diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-6.12.30/Documentation/filesystems/aufs/design/03atomic_open.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/03atomic_open.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/03atomic_open.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,85 @@ + +# Copyright (C) 2015-2025 Junjiro R. Okajima @@ -620,7 +620,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-6. + be implemented in aufs, but not all I am afraid. diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-6.12.30/Documentation/filesystems/aufs/design/03lookup.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/03lookup.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/03lookup.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,113 @@ + +# Copyright (C) 2005-2025 Junjiro R. Okajima @@ -737,7 +737,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-6.12.30 + by over-mounting something (or another method). diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-6.12.30/Documentation/filesystems/aufs/design/04branch.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/04branch.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/04branch.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,74 @@ + +# Copyright (C) 2005-2025 Junjiro R. Okajima @@ -815,7 +815,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-6.12.30 + same named entry on the upper branch. diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-6.12.30/Documentation/filesystems/aufs/design/05wbr_policy.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/05wbr_policy.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/05wbr_policy.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,64 @@ + +# Copyright (C) 2005-2025 Junjiro R. Okajima @@ -883,7 +883,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-6.1 + copyup policy. diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-6.12.30/Documentation/filesystems/aufs/design/06dirren.dot --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/06dirren.dot 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/06dirren.dot 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,44 @@ + +// to view this graph, run dot(1) command in GRAPHVIZ. @@ -931,7 +931,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-6.12.30 +} diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-6.12.30/Documentation/filesystems/aufs/design/06dirren.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/06dirren.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/06dirren.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,102 @@ + +# Copyright (C) 2017-2025 Junjiro R. Okajima @@ -1037,7 +1037,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-6.12.30 +equivalen to udba=reval case. diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-6.12.30/Documentation/filesystems/aufs/design/06fhsm.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/06fhsm.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/06fhsm.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,118 @@ + +# Copyright (C) 2011-2025 Junjiro R. Okajima @@ -1159,7 +1159,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-6.12.30/D +should restore the original file state after an error happens. diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-6.12.30/Documentation/filesystems/aufs/design/06mmap.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/06mmap.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/06mmap.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,40 @@ + +# Copyright (C) 2005-2025 Junjiro R. Okajima @@ -1203,7 +1203,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-6.12.30/D +will be much smaller than the approach aufs used to take. diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-6.12.30/Documentation/filesystems/aufs/design/06xattr.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/06xattr.txt 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/06xattr.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,94 @@ + +# Copyright (C) 2014-2025 Junjiro R. Okajima @@ -1301,7 +1301,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-6.12.30/ +now, aufs implements the branch attributes to ignore the error. diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-6.12.30/Documentation/filesystems/aufs/design/07export.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/07export.txt 2026-01-22 12:14:11.002746467 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/07export.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,58 @@ + +# Copyright (C) 2005-2025 Junjiro R. Okajima @@ -1363,7 +1363,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-6.12.30 + lookup_one_len(), vfs_getattr(), encode_fh() and others. diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-6.12.30/Documentation/filesystems/aufs/design/08shwh.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/08shwh.txt 2026-01-22 12:14:11.002746467 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/08shwh.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,52 @@ + +# Copyright (C) 2005-2025 Junjiro R. Okajima @@ -1419,7 +1419,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-6.12.30/D +initramfs will use it to replace the old one at the next boot. diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-6.12.30/Documentation/filesystems/aufs/design/10dynop.txt --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/design/10dynop.txt 2026-01-22 12:14:11.002746467 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/design/10dynop.txt 2026-03-25 14:52:47.432142492 +0300 @@ -0,0 +1,47 @@ + +# Copyright (C) 2010-2025 Junjiro R. Okajima @@ -1470,7 +1470,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-6.12.30/ +regular files only. diff -Naur null/Documentation/filesystems/aufs/README linux-6.12.30/Documentation/filesystems/aufs/README --- /dev/null -+++ linux-6.12.30/Documentation/filesystems/aufs/README 2026-01-22 12:14:10.999746505 +0300 ++++ linux-6.12.30/Documentation/filesystems/aufs/README 2026-03-25 14:52:47.431700815 +0300 @@ -0,0 +1,409 @@ + +Aufs6 -- advanced multi layered unification filesystem version 6.x @@ -1883,7 +1883,7 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-6.12.30/Documentatio +# End: ; diff -Naur null/fs/aufs/aufs.h linux-6.12.30/fs/aufs/aufs.h --- /dev/null -+++ linux-6.12.30/fs/aufs/aufs.h 2026-01-22 12:14:11.003746455 +0300 ++++ linux-6.12.30/fs/aufs/aufs.h 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -1949,7 +1949,7 @@ diff -Naur null/fs/aufs/aufs.h linux-6.12.30/fs/aufs/aufs.h +#endif /* __AUFS_H__ */ diff -Naur null/fs/aufs/branch.c linux-6.12.30/fs/aufs/branch.c --- /dev/null -+++ linux-6.12.30/fs/aufs/branch.c 2026-01-22 12:14:11.003746455 +0300 ++++ linux-6.12.30/fs/aufs/branch.c 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,1427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -3380,7 +3380,7 @@ diff -Naur null/fs/aufs/branch.c linux-6.12.30/fs/aufs/branch.c +} diff -Naur null/fs/aufs/branch.h linux-6.12.30/fs/aufs/branch.h --- /dev/null -+++ linux-6.12.30/fs/aufs/branch.h 2026-01-22 12:14:11.003746455 +0300 ++++ linux-6.12.30/fs/aufs/branch.h 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,375 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -3759,7 +3759,7 @@ diff -Naur null/fs/aufs/branch.h linux-6.12.30/fs/aufs/branch.h +#endif /* __AUFS_BRANCH_H__ */ diff -Naur null/fs/aufs/conf.mk linux-6.12.30/fs/aufs/conf.mk --- /dev/null -+++ linux-6.12.30/fs/aufs/conf.mk 2026-01-22 12:14:11.004746442 +0300 ++++ linux-6.12.30/fs/aufs/conf.mk 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -3803,7 +3803,7 @@ diff -Naur null/fs/aufs/conf.mk linux-6.12.30/fs/aufs/conf.mk +-include ${srctree}/${src}/conf_priv.mk diff -Naur null/fs/aufs/cpup.c linux-6.12.30/fs/aufs/cpup.c --- /dev/null -+++ linux-6.12.30/fs/aufs/cpup.c 2026-01-22 12:14:11.004746442 +0300 ++++ linux-6.12.30/fs/aufs/cpup.c 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,1446 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5253,7 +5253,7 @@ diff -Naur null/fs/aufs/cpup.c linux-6.12.30/fs/aufs/cpup.c +} diff -Naur null/fs/aufs/cpup.h linux-6.12.30/fs/aufs/cpup.h --- /dev/null -+++ linux-6.12.30/fs/aufs/cpup.h 2026-01-22 12:14:11.004746442 +0300 ++++ linux-6.12.30/fs/aufs/cpup.h 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,101 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5358,7 +5358,7 @@ diff -Naur null/fs/aufs/cpup.h linux-6.12.30/fs/aufs/cpup.h +#endif /* __AUFS_CPUP_H__ */ diff -Naur null/fs/aufs/dbgaufs.c linux-6.12.30/fs/aufs/dbgaufs.c --- /dev/null -+++ linux-6.12.30/fs/aufs/dbgaufs.c 2026-01-22 12:14:11.004746442 +0300 ++++ linux-6.12.30/fs/aufs/dbgaufs.c 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,526 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5888,7 +5888,7 @@ diff -Naur null/fs/aufs/dbgaufs.c linux-6.12.30/fs/aufs/dbgaufs.c +} diff -Naur null/fs/aufs/dbgaufs.h linux-6.12.30/fs/aufs/dbgaufs.h --- /dev/null -+++ linux-6.12.30/fs/aufs/dbgaufs.h 2026-01-22 12:14:11.004746442 +0300 ++++ linux-6.12.30/fs/aufs/dbgaufs.h 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5945,7 +5945,7 @@ diff -Naur null/fs/aufs/dbgaufs.h linux-6.12.30/fs/aufs/dbgaufs.h +#endif /* __DBGAUFS_H__ */ diff -Naur null/fs/aufs/dcsub.c linux-6.12.30/fs/aufs/dcsub.c --- /dev/null -+++ linux-6.12.30/fs/aufs/dcsub.c 2026-01-22 12:14:11.004746442 +0300 ++++ linux-6.12.30/fs/aufs/dcsub.c 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,225 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6174,7 +6174,7 @@ diff -Naur null/fs/aufs/dcsub.c linux-6.12.30/fs/aufs/dcsub.c +} diff -Naur null/fs/aufs/dcsub.h linux-6.12.30/fs/aufs/dcsub.h --- /dev/null -+++ linux-6.12.30/fs/aufs/dcsub.h 2026-01-22 12:14:11.004746442 +0300 ++++ linux-6.12.30/fs/aufs/dcsub.h 2026-03-25 14:52:47.435035737 +0300 @@ -0,0 +1,139 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -6317,7 +6317,7 @@ diff -Naur null/fs/aufs/dcsub.h linux-6.12.30/fs/aufs/dcsub.h +#endif /* __AUFS_DCSUB_H__ */ diff -Naur null/fs/aufs/debug.c linux-6.12.30/fs/aufs/debug.c --- /dev/null -+++ linux-6.12.30/fs/aufs/debug.c 2026-01-22 12:14:11.004746442 +0300 ++++ linux-6.12.30/fs/aufs/debug.c 2026-03-25 14:52:47.435035737 +0300 @@ -0,0 +1,448 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6769,7 +6769,7 @@ diff -Naur null/fs/aufs/debug.c linux-6.12.30/fs/aufs/debug.c +} diff -Naur null/fs/aufs/debug.h linux-6.12.30/fs/aufs/debug.h --- /dev/null -+++ linux-6.12.30/fs/aufs/debug.h 2026-01-22 12:14:11.004746442 +0300 ++++ linux-6.12.30/fs/aufs/debug.h 2026-03-25 14:52:47.435035737 +0300 @@ -0,0 +1,226 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -6999,7 +6999,7 @@ diff -Naur null/fs/aufs/debug.h linux-6.12.30/fs/aufs/debug.h +#endif /* __AUFS_DEBUG_H__ */ diff -Naur null/fs/aufs/dentry.c linux-6.12.30/fs/aufs/dentry.c --- /dev/null -+++ linux-6.12.30/fs/aufs/dentry.c 2026-01-22 12:14:11.007746405 +0300 ++++ linux-6.12.30/fs/aufs/dentry.c 2026-03-25 14:52:47.435035737 +0300 @@ -0,0 +1,1178 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -8181,7 +8181,7 @@ diff -Naur null/fs/aufs/dentry.c linux-6.12.30/fs/aufs/dentry.c +}; diff -Naur null/fs/aufs/dentry.h linux-6.12.30/fs/aufs/dentry.h --- /dev/null -+++ linux-6.12.30/fs/aufs/dentry.h 2026-01-22 12:14:11.007746405 +0300 ++++ linux-6.12.30/fs/aufs/dentry.h 2026-03-25 14:52:47.435035737 +0300 @@ -0,0 +1,270 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -8455,7 +8455,7 @@ diff -Naur null/fs/aufs/dentry.h linux-6.12.30/fs/aufs/dentry.h +#endif /* __AUFS_DENTRY_H__ */ diff -Naur null/fs/aufs/dinfo.c linux-6.12.30/fs/aufs/dinfo.c --- /dev/null -+++ linux-6.12.30/fs/aufs/dinfo.c 2026-01-22 12:14:11.007746405 +0300 ++++ linux-6.12.30/fs/aufs/dinfo.c 2026-03-25 14:52:47.435035737 +0300 @@ -0,0 +1,555 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9014,7 +9014,7 @@ diff -Naur null/fs/aufs/dinfo.c linux-6.12.30/fs/aufs/dinfo.c +} diff -Naur null/fs/aufs/dir.c linux-6.12.30/fs/aufs/dir.c --- /dev/null -+++ linux-6.12.30/fs/aufs/dir.c 2026-01-22 12:14:11.007746405 +0300 ++++ linux-6.12.30/fs/aufs/dir.c 2026-03-25 14:52:47.435035737 +0300 @@ -0,0 +1,765 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9783,7 +9783,7 @@ diff -Naur null/fs/aufs/dir.c linux-6.12.30/fs/aufs/dir.c +}; diff -Naur null/fs/aufs/dir.h linux-6.12.30/fs/aufs/dir.h --- /dev/null -+++ linux-6.12.30/fs/aufs/dir.h 2026-01-22 12:14:11.007746405 +0300 ++++ linux-6.12.30/fs/aufs/dir.h 2026-03-25 14:52:47.436035724 +0300 @@ -0,0 +1,134 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -9921,7 +9921,7 @@ diff -Naur null/fs/aufs/dir.h linux-6.12.30/fs/aufs/dir.h +#endif /* __AUFS_DIR_H__ */ diff -Naur null/fs/aufs/dirren.c linux-6.12.30/fs/aufs/dirren.c --- /dev/null -+++ linux-6.12.30/fs/aufs/dirren.c 2026-01-22 12:14:11.008746392 +0300 ++++ linux-6.12.30/fs/aufs/dirren.c 2026-03-25 14:52:47.436035724 +0300 @@ -0,0 +1,1308 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11233,7 +11233,7 @@ diff -Naur null/fs/aufs/dirren.c linux-6.12.30/fs/aufs/dirren.c +} diff -Naur null/fs/aufs/dirren.h linux-6.12.30/fs/aufs/dirren.h --- /dev/null -+++ linux-6.12.30/fs/aufs/dirren.h 2026-01-22 12:14:11.008746392 +0300 ++++ linux-6.12.30/fs/aufs/dirren.h 2026-03-25 14:52:47.436035724 +0300 @@ -0,0 +1,140 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11377,7 +11377,7 @@ diff -Naur null/fs/aufs/dirren.h linux-6.12.30/fs/aufs/dirren.h +#endif /* __AUFS_DIRREN_H__ */ diff -Naur null/fs/aufs/dynop.c linux-6.12.30/fs/aufs/dynop.c --- /dev/null -+++ linux-6.12.30/fs/aufs/dynop.c 2026-01-22 12:14:11.008746392 +0300 ++++ linux-6.12.30/fs/aufs/dynop.c 2026-03-25 14:52:47.436035724 +0300 @@ -0,0 +1,365 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11746,7 +11746,7 @@ diff -Naur null/fs/aufs/dynop.c linux-6.12.30/fs/aufs/dynop.c +} diff -Naur null/fs/aufs/dynop.h linux-6.12.30/fs/aufs/dynop.h --- /dev/null -+++ linux-6.12.30/fs/aufs/dynop.h 2026-01-22 12:14:11.008746392 +0300 ++++ linux-6.12.30/fs/aufs/dynop.h 2026-03-25 14:52:47.436035724 +0300 @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11827,7 +11827,7 @@ diff -Naur null/fs/aufs/dynop.h linux-6.12.30/fs/aufs/dynop.h +#endif /* __AUFS_DYNOP_H__ */ diff -Naur null/fs/aufs/export.c linux-6.12.30/fs/aufs/export.c --- /dev/null -+++ linux-6.12.30/fs/aufs/export.c 2026-01-22 12:14:11.008746392 +0300 ++++ linux-6.12.30/fs/aufs/export.c 2026-03-25 14:52:47.436035724 +0300 @@ -0,0 +1,846 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -12677,7 +12677,7 @@ diff -Naur null/fs/aufs/export.c linux-6.12.30/fs/aufs/export.c +} diff -Naur null/fs/aufs/fhsm.c linux-6.12.30/fs/aufs/fhsm.c --- /dev/null -+++ linux-6.12.30/fs/aufs/fhsm.c 2026-01-22 12:14:11.008746392 +0300 ++++ linux-6.12.30/fs/aufs/fhsm.c 2026-03-25 14:52:47.437035712 +0300 @@ -0,0 +1,426 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13107,7 +13107,7 @@ diff -Naur null/fs/aufs/fhsm.c linux-6.12.30/fs/aufs/fhsm.c +} diff -Naur null/fs/aufs/file.c linux-6.12.30/fs/aufs/file.c --- /dev/null -+++ linux-6.12.30/fs/aufs/file.c 2026-01-22 12:14:11.008746392 +0300 ++++ linux-6.12.30/fs/aufs/file.c 2026-03-25 14:52:47.437035712 +0300 @@ -0,0 +1,851 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13962,7 +13962,7 @@ diff -Naur null/fs/aufs/file.c linux-6.12.30/fs/aufs/file.c +}; diff -Naur null/fs/aufs/file.h linux-6.12.30/fs/aufs/file.h --- /dev/null -+++ linux-6.12.30/fs/aufs/file.h 2026-01-22 12:14:11.008746392 +0300 ++++ linux-6.12.30/fs/aufs/file.h 2026-03-25 14:52:47.437035712 +0300 @@ -0,0 +1,327 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -14293,7 +14293,7 @@ diff -Naur null/fs/aufs/file.h linux-6.12.30/fs/aufs/file.h +#endif /* __AUFS_FILE_H__ */ diff -Naur null/fs/aufs/finfo.c linux-6.12.30/fs/aufs/finfo.c --- /dev/null -+++ linux-6.12.30/fs/aufs/finfo.c 2026-01-22 12:14:11.009746380 +0300 ++++ linux-6.12.30/fs/aufs/finfo.c 2026-03-25 14:52:47.437035712 +0300 @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -14445,7 +14445,7 @@ diff -Naur null/fs/aufs/finfo.c linux-6.12.30/fs/aufs/finfo.c +} diff -Naur null/fs/aufs/f_op.c linux-6.12.30/fs/aufs/f_op.c --- /dev/null -+++ linux-6.12.30/fs/aufs/f_op.c 2026-01-22 12:14:11.008746392 +0300 ++++ linux-6.12.30/fs/aufs/f_op.c 2026-03-25 14:52:47.436035724 +0300 @@ -0,0 +1,791 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -15240,7 +15240,7 @@ diff -Naur null/fs/aufs/f_op.c linux-6.12.30/fs/aufs/f_op.c +}; diff -Naur null/fs/aufs/fsctx.c linux-6.12.30/fs/aufs/fsctx.c --- /dev/null -+++ linux-6.12.30/fs/aufs/fsctx.c 2026-01-22 12:14:11.009746380 +0300 ++++ linux-6.12.30/fs/aufs/fsctx.c 2026-03-25 14:52:47.437035712 +0300 @@ -0,0 +1,1244 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -16488,7 +16488,7 @@ diff -Naur null/fs/aufs/fsctx.c linux-6.12.30/fs/aufs/fsctx.c +} diff -Naur null/fs/aufs/fstype.h linux-6.12.30/fs/aufs/fstype.h --- /dev/null -+++ linux-6.12.30/fs/aufs/fstype.h 2026-01-22 12:14:11.009746380 +0300 ++++ linux-6.12.30/fs/aufs/fstype.h 2026-03-25 14:52:47.437035712 +0300 @@ -0,0 +1,419 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -16911,7 +16911,7 @@ diff -Naur null/fs/aufs/fstype.h linux-6.12.30/fs/aufs/fstype.h +#endif /* __AUFS_FSTYPE_H__ */ diff -Naur null/fs/aufs/hbl.h linux-6.12.30/fs/aufs/hbl.h --- /dev/null -+++ linux-6.12.30/fs/aufs/hbl.h 2026-01-22 12:14:11.009746380 +0300 ++++ linux-6.12.30/fs/aufs/hbl.h 2026-03-25 14:52:47.437035712 +0300 @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -16980,7 +16980,7 @@ diff -Naur null/fs/aufs/hbl.h linux-6.12.30/fs/aufs/hbl.h +#endif /* __AUFS_HBL_H__ */ diff -Naur null/fs/aufs/hfsnotify.c linux-6.12.30/fs/aufs/hfsnotify.c --- /dev/null -+++ linux-6.12.30/fs/aufs/hfsnotify.c 2026-01-22 12:14:11.009746380 +0300 ++++ linux-6.12.30/fs/aufs/hfsnotify.c 2026-03-25 14:52:47.438035699 +0300 @@ -0,0 +1,290 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17274,7 +17274,7 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-6.12.30/fs/aufs/hfsnotify.c +}; diff -Naur null/fs/aufs/hfsplus.c linux-6.12.30/fs/aufs/hfsplus.c --- /dev/null -+++ linux-6.12.30/fs/aufs/hfsplus.c 2026-01-22 12:14:11.009746380 +0300 ++++ linux-6.12.30/fs/aufs/hfsplus.c 2026-03-25 14:52:47.438035699 +0300 @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17338,7 +17338,7 @@ diff -Naur null/fs/aufs/hfsplus.c linux-6.12.30/fs/aufs/hfsplus.c +} diff -Naur null/fs/aufs/hnotify.c linux-6.12.30/fs/aufs/hnotify.c --- /dev/null -+++ linux-6.12.30/fs/aufs/hnotify.c 2026-01-22 12:14:11.009746380 +0300 ++++ linux-6.12.30/fs/aufs/hnotify.c 2026-03-25 14:52:47.438035699 +0300 @@ -0,0 +1,715 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18057,7 +18057,7 @@ diff -Naur null/fs/aufs/hnotify.c linux-6.12.30/fs/aufs/hnotify.c +} diff -Naur null/fs/aufs/iinfo.c linux-6.12.30/fs/aufs/iinfo.c --- /dev/null -+++ linux-6.12.30/fs/aufs/iinfo.c 2026-01-22 12:14:11.010746367 +0300 ++++ linux-6.12.30/fs/aufs/iinfo.c 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,288 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18349,7 +18349,7 @@ diff -Naur null/fs/aufs/iinfo.c linux-6.12.30/fs/aufs/iinfo.c +} diff -Naur null/fs/aufs/inode.c linux-6.12.30/fs/aufs/inode.c --- /dev/null -+++ linux-6.12.30/fs/aufs/inode.c 2026-01-22 12:14:11.010746367 +0300 ++++ linux-6.12.30/fs/aufs/inode.c 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,532 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18885,7 +18885,7 @@ diff -Naur null/fs/aufs/inode.c linux-6.12.30/fs/aufs/inode.c +} diff -Naur null/fs/aufs/inode.h linux-6.12.30/fs/aufs/inode.h --- /dev/null -+++ linux-6.12.30/fs/aufs/inode.h 2026-01-22 12:14:11.010746367 +0300 ++++ linux-6.12.30/fs/aufs/inode.h 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,728 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -19617,7 +19617,7 @@ diff -Naur null/fs/aufs/inode.h linux-6.12.30/fs/aufs/inode.h +#endif /* __AUFS_INODE_H__ */ diff -Naur null/fs/aufs/ioctl.c linux-6.12.30/fs/aufs/ioctl.c --- /dev/null -+++ linux-6.12.30/fs/aufs/ioctl.c 2026-01-22 12:14:11.010746367 +0300 ++++ linux-6.12.30/fs/aufs/ioctl.c 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -19841,7 +19841,7 @@ diff -Naur null/fs/aufs/ioctl.c linux-6.12.30/fs/aufs/ioctl.c +#endif diff -Naur null/fs/aufs/i_op_add.c linux-6.12.30/fs/aufs/i_op_add.c --- /dev/null -+++ linux-6.12.30/fs/aufs/i_op_add.c 2026-01-22 12:14:11.010746367 +0300 ++++ linux-6.12.30/fs/aufs/i_op_add.c 2026-03-25 14:52:47.438035699 +0300 @@ -0,0 +1,947 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -20792,7 +20792,7 @@ diff -Naur null/fs/aufs/i_op_add.c linux-6.12.30/fs/aufs/i_op_add.c +} diff -Naur null/fs/aufs/i_op.c linux-6.12.30/fs/aufs/i_op.c --- /dev/null -+++ linux-6.12.30/fs/aufs/i_op.c 2026-01-22 12:14:11.010746367 +0300 ++++ linux-6.12.30/fs/aufs/i_op.c 2026-03-25 14:52:47.438035699 +0300 @@ -0,0 +1,1522 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22318,7 +22318,7 @@ diff -Naur null/fs/aufs/i_op.c linux-6.12.30/fs/aufs/i_op.c +}; diff -Naur null/fs/aufs/i_op_del.c linux-6.12.30/fs/aufs/i_op_del.c --- /dev/null -+++ linux-6.12.30/fs/aufs/i_op_del.c 2026-01-22 12:14:11.010746367 +0300 ++++ linux-6.12.30/fs/aufs/i_op_del.c 2026-03-25 14:52:47.438035699 +0300 @@ -0,0 +1,517 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22839,7 +22839,7 @@ diff -Naur null/fs/aufs/i_op_del.c linux-6.12.30/fs/aufs/i_op_del.c +} diff -Naur null/fs/aufs/i_op_ren.c linux-6.12.30/fs/aufs/i_op_ren.c --- /dev/null -+++ linux-6.12.30/fs/aufs/i_op_ren.c 2026-01-22 12:14:11.010746367 +0300 ++++ linux-6.12.30/fs/aufs/i_op_ren.c 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,1242 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24085,7 +24085,7 @@ diff -Naur null/fs/aufs/i_op_ren.c linux-6.12.30/fs/aufs/i_op_ren.c +} diff -Naur null/fs/aufs/Kconfig linux-6.12.30/fs/aufs/Kconfig --- /dev/null -+++ linux-6.12.30/fs/aufs/Kconfig 2026-01-22 12:14:11.003746455 +0300 ++++ linux-6.12.30/fs/aufs/Kconfig 2026-03-25 14:52:47.434465972 +0300 @@ -0,0 +1,201 @@ +# SPDX-License-Identifier: GPL-2.0 +config AUFS_FS @@ -24290,7 +24290,7 @@ diff -Naur null/fs/aufs/Kconfig linux-6.12.30/fs/aufs/Kconfig +endif diff -Naur null/fs/aufs/lcnt.h linux-6.12.30/fs/aufs/lcnt.h --- /dev/null -+++ linux-6.12.30/fs/aufs/lcnt.h 2026-01-22 12:14:11.010746367 +0300 ++++ linux-6.12.30/fs/aufs/lcnt.h 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,186 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24480,7 +24480,7 @@ diff -Naur null/fs/aufs/lcnt.h linux-6.12.30/fs/aufs/lcnt.h +#endif /* __AUFS_LCNT_H__ */ diff -Naur null/fs/aufs/loop.c linux-6.12.30/fs/aufs/loop.c --- /dev/null -+++ linux-6.12.30/fs/aufs/loop.c 2026-01-22 12:14:11.011746355 +0300 ++++ linux-6.12.30/fs/aufs/loop.c 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24632,7 +24632,7 @@ diff -Naur null/fs/aufs/loop.c linux-6.12.30/fs/aufs/loop.c +} diff -Naur null/fs/aufs/loop.h linux-6.12.30/fs/aufs/loop.h --- /dev/null -+++ linux-6.12.30/fs/aufs/loop.h 2026-01-22 12:14:11.011746355 +0300 ++++ linux-6.12.30/fs/aufs/loop.h 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24691,7 +24691,7 @@ diff -Naur null/fs/aufs/loop.h linux-6.12.30/fs/aufs/loop.h +#endif /* __AUFS_LOOP_H__ */ diff -Naur null/fs/aufs/magic.mk linux-6.12.30/fs/aufs/magic.mk --- /dev/null -+++ linux-6.12.30/fs/aufs/magic.mk 2026-01-22 12:14:11.011746355 +0300 ++++ linux-6.12.30/fs/aufs/magic.mk 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -24726,7 +24726,7 @@ diff -Naur null/fs/aufs/magic.mk linux-6.12.30/fs/aufs/magic.mk +endif diff -Naur null/fs/aufs/Makefile linux-6.12.30/fs/aufs/Makefile --- /dev/null -+++ linux-6.12.30/fs/aufs/Makefile 2026-01-22 12:14:11.003746455 +0300 ++++ linux-6.12.30/fs/aufs/Makefile 2026-03-25 14:52:47.434610124 +0300 @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -24776,7 +24776,7 @@ diff -Naur null/fs/aufs/Makefile linux-6.12.30/fs/aufs/Makefile +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o diff -Naur null/fs/aufs/mf.c linux-6.12.30/fs/aufs/mf.c --- /dev/null -+++ linux-6.12.30/fs/aufs/mf.c 2026-01-22 12:14:11.011746355 +0300 ++++ linux-6.12.30/fs/aufs/mf.c 2026-03-25 14:52:47.439035687 +0300 @@ -0,0 +1,119 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24899,7 +24899,7 @@ diff -Naur null/fs/aufs/mf.c linux-6.12.30/fs/aufs/mf.c +EXPORT_SYMBOL_GPL(au_do_file_user_inode); diff -Naur null/fs/aufs/module.c linux-6.12.30/fs/aufs/module.c --- /dev/null -+++ linux-6.12.30/fs/aufs/module.c 2026-01-22 12:14:11.011746355 +0300 ++++ linux-6.12.30/fs/aufs/module.c 2026-03-25 14:52:47.440035674 +0300 @@ -0,0 +1,275 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25178,7 +25178,7 @@ diff -Naur null/fs/aufs/module.c linux-6.12.30/fs/aufs/module.c +module_exit(aufs_exit); diff -Naur null/fs/aufs/module.h linux-6.12.30/fs/aufs/module.h --- /dev/null -+++ linux-6.12.30/fs/aufs/module.h 2026-01-22 12:14:11.012746342 +0300 ++++ linux-6.12.30/fs/aufs/module.h 2026-03-25 14:52:47.440035674 +0300 @@ -0,0 +1,180 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -25362,7 +25362,7 @@ diff -Naur null/fs/aufs/module.h linux-6.12.30/fs/aufs/module.h +#endif /* __AUFS_MODULE_H__ */ diff -Naur null/fs/aufs/mvdown.c linux-6.12.30/fs/aufs/mvdown.c --- /dev/null -+++ linux-6.12.30/fs/aufs/mvdown.c 2026-01-22 12:14:11.012746342 +0300 ++++ linux-6.12.30/fs/aufs/mvdown.c 2026-03-25 14:52:47.440035674 +0300 @@ -0,0 +1,700 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -26066,7 +26066,7 @@ diff -Naur null/fs/aufs/mvdown.c linux-6.12.30/fs/aufs/mvdown.c +} diff -Naur null/fs/aufs/opts.c linux-6.12.30/fs/aufs/opts.c --- /dev/null -+++ linux-6.12.30/fs/aufs/opts.c 2026-01-22 12:14:11.012746342 +0300 ++++ linux-6.12.30/fs/aufs/opts.c 2026-03-25 14:52:47.440035674 +0300 @@ -0,0 +1,1030 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27100,7 +27100,7 @@ diff -Naur null/fs/aufs/opts.c linux-6.12.30/fs/aufs/opts.c +} diff -Naur null/fs/aufs/opts.h linux-6.12.30/fs/aufs/opts.h --- /dev/null -+++ linux-6.12.30/fs/aufs/opts.h 2026-01-22 12:14:11.012746342 +0300 ++++ linux-6.12.30/fs/aufs/opts.h 2026-03-25 14:52:47.440035674 +0300 @@ -0,0 +1,264 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -27368,7 +27368,7 @@ diff -Naur null/fs/aufs/opts.h linux-6.12.30/fs/aufs/opts.h +#endif /* __AUFS_OPTS_H__ */ diff -Naur null/fs/aufs/plink.c linux-6.12.30/fs/aufs/plink.c --- /dev/null -+++ linux-6.12.30/fs/aufs/plink.c 2026-01-22 12:14:11.012746342 +0300 ++++ linux-6.12.30/fs/aufs/plink.c 2026-03-25 14:52:47.440035674 +0300 @@ -0,0 +1,508 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27880,7 +27880,7 @@ diff -Naur null/fs/aufs/plink.c linux-6.12.30/fs/aufs/plink.c +} diff -Naur null/fs/aufs/poll.c linux-6.12.30/fs/aufs/poll.c --- /dev/null -+++ linux-6.12.30/fs/aufs/poll.c 2026-01-22 12:14:11.012746342 +0300 ++++ linux-6.12.30/fs/aufs/poll.c 2026-03-25 14:52:47.440035674 +0300 @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27935,7 +27935,7 @@ diff -Naur null/fs/aufs/poll.c linux-6.12.30/fs/aufs/poll.c +} diff -Naur null/fs/aufs/posix_acl.c linux-6.12.30/fs/aufs/posix_acl.c --- /dev/null -+++ linux-6.12.30/fs/aufs/posix_acl.c 2026-01-22 12:14:11.012746342 +0300 ++++ linux-6.12.30/fs/aufs/posix_acl.c 2026-03-25 14:52:47.441035662 +0300 @@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28047,7 +28047,7 @@ diff -Naur null/fs/aufs/posix_acl.c linux-6.12.30/fs/aufs/posix_acl.c +} diff -Naur null/fs/aufs/procfs.c linux-6.12.30/fs/aufs/procfs.c --- /dev/null -+++ linux-6.12.30/fs/aufs/procfs.c 2026-01-22 12:14:11.014746317 +0300 ++++ linux-6.12.30/fs/aufs/procfs.c 2026-03-25 14:52:47.441035662 +0300 @@ -0,0 +1,168 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28219,7 +28219,7 @@ diff -Naur null/fs/aufs/procfs.c linux-6.12.30/fs/aufs/procfs.c +} diff -Naur null/fs/aufs/rdu.c linux-6.12.30/fs/aufs/rdu.c --- /dev/null -+++ linux-6.12.30/fs/aufs/rdu.c 2026-01-22 12:14:11.014746317 +0300 ++++ linux-6.12.30/fs/aufs/rdu.c 2026-03-25 14:52:47.441035662 +0300 @@ -0,0 +1,384 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28607,7 +28607,7 @@ diff -Naur null/fs/aufs/rdu.c linux-6.12.30/fs/aufs/rdu.c +#endif diff -Naur null/fs/aufs/rwsem.h linux-6.12.30/fs/aufs/rwsem.h --- /dev/null -+++ linux-6.12.30/fs/aufs/rwsem.h 2026-01-22 12:14:11.014746317 +0300 ++++ linux-6.12.30/fs/aufs/rwsem.h 2026-03-25 14:52:47.441035662 +0300 @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -28700,7 +28700,7 @@ diff -Naur null/fs/aufs/rwsem.h linux-6.12.30/fs/aufs/rwsem.h +#endif /* __AUFS_RWSEM_H__ */ diff -Naur null/fs/aufs/sbinfo.c linux-6.12.30/fs/aufs/sbinfo.c --- /dev/null -+++ linux-6.12.30/fs/aufs/sbinfo.c 2026-01-22 12:14:11.014746317 +0300 ++++ linux-6.12.30/fs/aufs/sbinfo.c 2026-03-25 14:52:47.441035662 +0300 @@ -0,0 +1,316 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29020,7 +29020,7 @@ diff -Naur null/fs/aufs/sbinfo.c linux-6.12.30/fs/aufs/sbinfo.c +} diff -Naur null/fs/aufs/super.c linux-6.12.30/fs/aufs/super.c --- /dev/null -+++ linux-6.12.30/fs/aufs/super.c 2026-01-22 12:14:11.014746317 +0300 ++++ linux-6.12.30/fs/aufs/super.c 2026-03-25 14:52:47.441035662 +0300 @@ -0,0 +1,871 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29895,7 +29895,7 @@ diff -Naur null/fs/aufs/super.c linux-6.12.30/fs/aufs/super.c +}; diff -Naur null/fs/aufs/super.h linux-6.12.30/fs/aufs/super.h --- /dev/null -+++ linux-6.12.30/fs/aufs/super.h 2026-01-22 12:14:11.014746317 +0300 ++++ linux-6.12.30/fs/aufs/super.h 2026-03-25 14:52:47.441035662 +0300 @@ -0,0 +1,618 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -30517,7 +30517,7 @@ diff -Naur null/fs/aufs/super.h linux-6.12.30/fs/aufs/super.h +#endif /* __AUFS_SUPER_H__ */ diff -Naur null/fs/aufs/sysaufs.c linux-6.12.30/fs/aufs/sysaufs.c --- /dev/null -+++ linux-6.12.30/fs/aufs/sysaufs.c 2026-01-22 12:14:11.014746317 +0300 ++++ linux-6.12.30/fs/aufs/sysaufs.c 2026-03-25 14:52:47.441035662 +0300 @@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30615,7 +30615,7 @@ diff -Naur null/fs/aufs/sysaufs.c linux-6.12.30/fs/aufs/sysaufs.c +} diff -Naur null/fs/aufs/sysaufs.h linux-6.12.30/fs/aufs/sysaufs.h --- /dev/null -+++ linux-6.12.30/fs/aufs/sysaufs.h 2026-01-22 12:14:11.014746317 +0300 ++++ linux-6.12.30/fs/aufs/sysaufs.h 2026-03-25 14:52:47.442035649 +0300 @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -30721,7 +30721,7 @@ diff -Naur null/fs/aufs/sysaufs.h linux-6.12.30/fs/aufs/sysaufs.h +#endif /* __SYSAUFS_H__ */ diff -Naur null/fs/aufs/sysfs.c linux-6.12.30/fs/aufs/sysfs.c --- /dev/null -+++ linux-6.12.30/fs/aufs/sysfs.c 2026-01-22 12:14:11.014746317 +0300 ++++ linux-6.12.30/fs/aufs/sysfs.c 2026-03-25 14:52:47.442035649 +0300 @@ -0,0 +1,374 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31099,7 +31099,7 @@ diff -Naur null/fs/aufs/sysfs.c linux-6.12.30/fs/aufs/sysfs.c +} diff -Naur null/fs/aufs/sysrq.c linux-6.12.30/fs/aufs/sysrq.c --- /dev/null -+++ linux-6.12.30/fs/aufs/sysrq.c 2026-01-22 12:14:11.015746305 +0300 ++++ linux-6.12.30/fs/aufs/sysrq.c 2026-03-25 14:52:47.442035649 +0300 @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31260,7 +31260,7 @@ diff -Naur null/fs/aufs/sysrq.c linux-6.12.30/fs/aufs/sysrq.c +} diff -Naur null/fs/aufs/vdir.c linux-6.12.30/fs/aufs/vdir.c --- /dev/null -+++ linux-6.12.30/fs/aufs/vdir.c 2026-01-22 12:14:11.015746305 +0300 ++++ linux-6.12.30/fs/aufs/vdir.c 2026-03-25 14:52:47.442035649 +0300 @@ -0,0 +1,896 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -32160,7 +32160,7 @@ diff -Naur null/fs/aufs/vdir.c linux-6.12.30/fs/aufs/vdir.c +} diff -Naur null/fs/aufs/vfsub.c linux-6.12.30/fs/aufs/vfsub.c --- /dev/null -+++ linux-6.12.30/fs/aufs/vfsub.c 2026-01-22 12:14:11.015746305 +0300 ++++ linux-6.12.30/fs/aufs/vfsub.c 2026-03-25 14:52:47.442035649 +0300 @@ -0,0 +1,1005 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -32197,7 +32197,7 @@ diff -Naur null/fs/aufs/vfsub.c linux-6.12.30/fs/aufs/vfsub.c + if (!au_test_fuse(h_sb) || !au_userns) + return 0; + -+ return is_current_mnt_ns(mnt) ? 0 : -EACCES; ++ return our_mnt(mnt) ? 0 : -EACCES; +} +#endif + @@ -33169,7 +33169,7 @@ diff -Naur null/fs/aufs/vfsub.c linux-6.12.30/fs/aufs/vfsub.c +} diff -Naur null/fs/aufs/vfsub.h linux-6.12.30/fs/aufs/vfsub.h --- /dev/null -+++ linux-6.12.30/fs/aufs/vfsub.h 2026-01-22 12:14:11.015746305 +0300 ++++ linux-6.12.30/fs/aufs/vfsub.h 2026-03-25 14:52:47.443035637 +0300 @@ -0,0 +1,436 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -33609,7 +33609,7 @@ diff -Naur null/fs/aufs/vfsub.h linux-6.12.30/fs/aufs/vfsub.h +#endif /* __AUFS_VFSUB_H__ */ diff -Naur null/fs/aufs/wbr_policy.c linux-6.12.30/fs/aufs/wbr_policy.c --- /dev/null -+++ linux-6.12.30/fs/aufs/wbr_policy.c 2026-01-22 12:14:11.015746305 +0300 ++++ linux-6.12.30/fs/aufs/wbr_policy.c 2026-03-25 14:52:47.443035637 +0300 @@ -0,0 +1,836 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -34449,7 +34449,7 @@ diff -Naur null/fs/aufs/wbr_policy.c linux-6.12.30/fs/aufs/wbr_policy.c +}; diff -Naur null/fs/aufs/whout.c linux-6.12.30/fs/aufs/whout.c --- /dev/null -+++ linux-6.12.30/fs/aufs/whout.c 2026-01-22 12:14:11.016746292 +0300 ++++ linux-6.12.30/fs/aufs/whout.c 2026-03-25 14:52:47.443035637 +0300 @@ -0,0 +1,1049 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35502,7 +35502,7 @@ diff -Naur null/fs/aufs/whout.c linux-6.12.30/fs/aufs/whout.c +} diff -Naur null/fs/aufs/whout.h linux-6.12.30/fs/aufs/whout.h --- /dev/null -+++ linux-6.12.30/fs/aufs/whout.h 2026-01-22 12:14:11.016746292 +0300 ++++ linux-6.12.30/fs/aufs/whout.h 2026-03-25 14:52:47.443035637 +0300 @@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -35593,7 +35593,7 @@ diff -Naur null/fs/aufs/whout.h linux-6.12.30/fs/aufs/whout.h +#endif /* __AUFS_WHOUT_H__ */ diff -Naur null/fs/aufs/wkq.c linux-6.12.30/fs/aufs/wkq.c --- /dev/null -+++ linux-6.12.30/fs/aufs/wkq.c 2026-01-22 12:14:11.016746292 +0300 ++++ linux-6.12.30/fs/aufs/wkq.c 2026-03-25 14:52:47.443035637 +0300 @@ -0,0 +1,370 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35967,7 +35967,7 @@ diff -Naur null/fs/aufs/wkq.c linux-6.12.30/fs/aufs/wkq.c +} diff -Naur null/fs/aufs/wkq.h linux-6.12.30/fs/aufs/wkq.h --- /dev/null -+++ linux-6.12.30/fs/aufs/wkq.h 2026-01-22 12:14:11.016746292 +0300 ++++ linux-6.12.30/fs/aufs/wkq.h 2026-03-25 14:52:47.443035637 +0300 @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -36060,7 +36060,7 @@ diff -Naur null/fs/aufs/wkq.h linux-6.12.30/fs/aufs/wkq.h +#endif /* __AUFS_WKQ_H__ */ diff -Naur null/fs/aufs/xattr.c linux-6.12.30/fs/aufs/xattr.c --- /dev/null -+++ linux-6.12.30/fs/aufs/xattr.c 2026-01-22 12:14:11.016746292 +0300 ++++ linux-6.12.30/fs/aufs/xattr.c 2026-03-25 14:52:47.444035624 +0300 @@ -0,0 +1,360 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -36424,7 +36424,7 @@ diff -Naur null/fs/aufs/xattr.c linux-6.12.30/fs/aufs/xattr.c +} diff -Naur null/fs/aufs/xino.c linux-6.12.30/fs/aufs/xino.c --- /dev/null -+++ linux-6.12.30/fs/aufs/xino.c 2026-01-22 12:14:11.016746292 +0300 ++++ linux-6.12.30/fs/aufs/xino.c 2026-03-25 14:52:47.444035624 +0300 @@ -0,0 +1,1927 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -38355,7 +38355,7 @@ diff -Naur null/fs/aufs/xino.c linux-6.12.30/fs/aufs/xino.c +} diff -Naur null/include/uapi/linux/aufs_type.h linux-6.12.30/include/uapi/linux/aufs_type.h --- /dev/null -+++ linux-6.12.30/include/uapi/linux/aufs_type.h 2026-01-22 12:14:11.019746255 +0300 ++++ linux-6.12.30/include/uapi/linux/aufs_type.h 2026-03-25 14:52:47.445565498 +0300 @@ -0,0 +1,452 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* @@ -38399,7 +38399,7 @@ diff -Naur null/include/uapi/linux/aufs_type.h linux-6.12.30/include/uapi/linux/ +#include +#endif /* __KERNEL__ */ + -+#define AUFS_VERSION "6.12-20260112" ++#define AUFS_VERSION "6.12-20260223" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') diff --git a/kernel/tools/perf/files/patches/linux/patch-6.12.70.xz b/kernel/tools/perf/files/patches/linux/patch-6.12.70.xz deleted file mode 100644 index cded80752e..0000000000 Binary files a/kernel/tools/perf/files/patches/linux/patch-6.12.70.xz and /dev/null differ diff --git a/kernel/tools/perf/files/patches/linux/patch-6.12.78.xz b/kernel/tools/perf/files/patches/linux/patch-6.12.78.xz new file mode 100644 index 0000000000..890f3ae126 Binary files /dev/null and b/kernel/tools/perf/files/patches/linux/patch-6.12.78.xz differ diff --git a/kernel/tools/perf/pspec.xml b/kernel/tools/perf/pspec.xml index d2048fcf08..41ad535c08 100644 --- a/kernel/tools/perf/pspec.xml +++ b/kernel/tools/perf/pspec.xml @@ -43,10 +43,10 @@ - patches/linux/patch-6.12.70.xz + patches/linux/patch-6.12.78.xz - patches/aufs6/aufs6.12-20260112.patch + patches/aufs6/aufs6.12-20260223.patch patches/aufs6/aufs6-base.patch patches/aufs6/aufs6-kbuild.patch @@ -131,6 +131,13 @@ + + 2026-03-25 + 6.12.78 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2026-02-12 6.12.70