diff --git a/kernel/tools/cpupowertools/files/patches/aufs5/aufs5-loopback.patch b/kernel/tools/cpupowertools/files/patches/aufs5/aufs5-loopback.patch index e3897d08..55f432d0 100644 --- a/kernel/tools/cpupowertools/files/patches/aufs5/aufs5-loopback.patch +++ b/kernel/tools/cpupowertools/files/patches/aufs5/aufs5-loopback.patch @@ -72,7 +72,7 @@ index 7a9e40b97831..5ed06240cc9c 100644 fput(file); + if (virt_file) + fput(virt_file); - return error; + goto done; } @@ -1201,6 +1224,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, diff --git a/kernel/tools/cpupowertools/files/patches/aufs5/aufs5-mmap.patch b/kernel/tools/cpupowertools/files/patches/aufs5/aufs5-mmap.patch index 05ee1b40..c74ea225 100644 --- a/kernel/tools/cpupowertools/files/patches/aufs5/aufs5-mmap.patch +++ b/kernel/tools/cpupowertools/files/patches/aufs5/aufs5-mmap.patch @@ -79,7 +79,7 @@ index 04345ff97f8c..4ab9bb75c894 100644 unmap_mapping_range(mapping, holebegin, holelen, 0); } -+#if IS_ENABLED(CONFIG_AUFS_FS) ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ +extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int); +extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[], + int); @@ -127,7 +127,7 @@ index 7f8ee09c711f..8fea872e08f7 100644 unsigned long vm_top; /* region allocated to here */ unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */ struct file *vm_file; /* the backing file or NULL */ -+#if IS_ENABLED(CONFIG_AUFS_FS) ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ + struct file *vm_prfile; /* the virtual backing file or NULL */ +#endif @@ -137,7 +137,7 @@ index 7f8ee09c711f..8fea872e08f7 100644 unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE units */ struct file * vm_file; /* File we map to (can be NULL). */ -+#if IS_ENABLED(CONFIG_AUFS_FS) ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ + struct file *vm_prfile; /* shadow of vm_file */ +#endif void * vm_private_data; /* was vm_pte (shared mem) */ @@ -164,7 +164,7 @@ index fc60a40ce954..d45773672730 100644 obj-$(CONFIG_IO_MAPPING) += io-mapping.o obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o -+obj-$(CONFIG_AUFS_FS:m=y) += prfile.o ++obj-y += prfile.o diff --git a/mm/filemap.c b/mm/filemap.c index 00e391e75880..d8b52d814319 100644 --- a/mm/filemap.c @@ -231,7 +231,7 @@ index 6bb553ed5c55..3f9d6d155171 100644 unsigned long populate = 0; unsigned long ret = -EINVAL; struct file *file; -+#if IS_ENABLED(CONFIG_AUFS_FS) ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ + struct file *prfile; +#endif @@ -241,7 +241,7 @@ index 6bb553ed5c55..3f9d6d155171 100644 if (vma->vm_flags & VM_LOCKED) flags |= MAP_LOCKED; -+#if IS_ENABLED(CONFIG_AUFS_FS) ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ + vma_get_file(vma); + file = vma->vm_file; + prfile = vma->vm_prfile; diff --git a/kernel/tools/cpupowertools/files/patches/aufs5/aufs5.15.41-20221219.patch b/kernel/tools/cpupowertools/files/patches/aufs5/aufs5.15.41-20230227.patch similarity index 99% rename from kernel/tools/cpupowertools/files/patches/aufs5/aufs5.15.41-20221219.patch rename to kernel/tools/cpupowertools/files/patches/aufs5/aufs5.15.41-20230227.patch index fa1ebf39..dfa6a881 100644 --- a/kernel/tools/cpupowertools/files/patches/aufs5/aufs5.15.41-20221219.patch +++ b/kernel/tools/cpupowertools/files/patches/aufs5/aufs5.15.41-20230227.patch @@ -1,6 +1,6 @@ diff -Naur null/Documentation/ABI/testing/debugfs-aufs linux-5.15.41/Documentation/ABI/testing/debugfs-aufs --- /dev/null -+++ linux-5.15.41/Documentation/ABI/testing/debugfs-aufs 2023-01-03 20:33:04.499529241 +0300 ++++ linux-5.15.41/Documentation/ABI/testing/debugfs-aufs 2023-05-03 13:34:15.651575145 +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-5.15.41/Documentati + will be empty. About XINO files, see the aufs manual. diff -Naur null/Documentation/ABI/testing/sysfs-aufs linux-5.15.41/Documentation/ABI/testing/sysfs-aufs --- /dev/null -+++ linux-5.15.41/Documentation/ABI/testing/sysfs-aufs 2023-01-03 20:33:04.499529241 +0300 ++++ linux-5.15.41/Documentation/ABI/testing/sysfs-aufs 2023-05-03 13:34:15.651575145 +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-5.15.41/Documentation + will be empty. About XINO files, see the aufs manual. diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt 2023-01-03 20:33:04.499529241 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/01intro.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,171 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -269,7 +269,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/01intro.txt linux-5.15.41/ +about it. But currently I have implemented it in kernel space. diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt 2023-01-03 20:33:04.499529241 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/02struct.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,258 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -531,7 +531,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/02struct.txt linux-5.15.41 +For this purpose, use "aumvdown" command in aufs-util.git. diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/03atomic_open.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,85 @@ + +# Copyright (C) 2015-2021 Junjiro R. Okajima @@ -620,7 +620,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/03atomic_open.txt linux-5. + be implemented in aufs, but not all I am afraid. diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/03lookup.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,113 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -737,7 +737,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/03lookup.txt linux-5.15.41 + by over-mounting something (or another method). diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/04branch.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,74 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -815,7 +815,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/04branch.txt linux-5.15.41 + same named entry on the upper branch. diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/05wbr_policy.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,64 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -883,7 +883,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/05wbr_policy.txt linux-5.1 + copyup policy. diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.dot 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,31 @@ + +// to view this graph, run dot(1) command in GRAPHVIZ. @@ -918,7 +918,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.dot linux-5.15.41 +} diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06dirren.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,102 @@ + +# Copyright (C) 2017-2021 Junjiro R. Okajima @@ -1024,7 +1024,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06dirren.txt linux-5.15.41 +equivalen to udba=reval case. diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06fhsm.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,120 @@ + +# Copyright (C) 2011-2021 Junjiro R. Okajima @@ -1148,7 +1148,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06fhsm.txt linux-5.15.41/D +should restore the original file state after an error happens. diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06mmap.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,72 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1224,7 +1224,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06mmap.txt linux-5.15.41/D +I have to give up this "looks-smater" approach. diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/06xattr.txt 2023-05-03 13:34:15.652575133 +0300 @@ -0,0 +1,96 @@ + +# Copyright (C) 2014-2021 Junjiro R. Okajima @@ -1324,7 +1324,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/06xattr.txt linux-5.15.41/ +now, aufs implements the branch attributes to ignore the error. diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/07export.txt 2023-05-03 13:34:15.653575120 +0300 @@ -0,0 +1,58 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1386,7 +1386,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/07export.txt linux-5.15.41 + lookup_one_len(), vfs_getattr(), encode_fh() and others. diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/08shwh.txt 2023-05-03 13:34:15.653575120 +0300 @@ -0,0 +1,52 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1442,7 +1442,7 @@ diff -Naur null/Documentation/filesystems/aufs/design/08shwh.txt linux-5.15.41/D +initramfs will use it to replace the old one at the next boot. diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt 2023-01-03 20:33:04.500529229 +0300 ++++ linux-5.15.41/Documentation/filesystems/aufs/design/10dynop.txt 2023-05-03 13:34:15.653575120 +0300 @@ -0,0 +1,47 @@ + +# Copyright (C) 2010-2021 Junjiro R. Okajima @@ -1493,8 +1493,8 @@ diff -Naur null/Documentation/filesystems/aufs/design/10dynop.txt linux-5.15.41/ +regular files only. diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentation/filesystems/aufs/README --- /dev/null -+++ linux-5.15.41/Documentation/filesystems/aufs/README 2023-01-03 20:33:04.499529241 +0300 -@@ -0,0 +1,397 @@ ++++ linux-5.15.41/Documentation/filesystems/aufs/README 2023-05-03 13:34:15.652575133 +0300 +@@ -0,0 +1,406 @@ + +Aufs5 -- advanced multi layered unification filesystem version 5.x +http://aufs.sf.net @@ -1519,6 +1519,10 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio +- for linux-v2.6.16 and later, try aufs2-2.6.git, aufs2-standalone.git + or aufs1 from CVS on SourceForge. + ++Note: the name of aufs5-linux.git and aufs5-standalone.git on github ++ were changed. Now they are aufs-linux.git and ++ aufs-standalone.git and they contain aufs5 and later branches. ++ +Note: it becomes clear that "Aufs was rejected. Let's give it up." + According to Christoph Hellwig, linux rejects all union-type + filesystems but UnionMount. @@ -1595,21 +1599,20 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio + +2. Download +---------------------------------------- -+There are three GIT trees for aufs5, aufs5-linux.git, -+aufs5-standalone.git, and aufs-util.git. Note that there is no "5" in -+"aufs-util.git." -+While the aufs-util is always necessary, you need either of aufs5-linux -+or aufs5-standalone. ++There are three GIT trees for aufs5, aufs-linux.git, ++aufs-standalone.git, and aufs-util.git. ++While the aufs-util is always necessary, you need either of aufs-linux ++or aufs-standalone. + -+The aufs5-linux tree includes the whole linux mainline GIT tree, ++The aufs-linux tree includes the whole linux mainline GIT tree, +git://git.kernel.org/.../torvalds/linux.git. +And you cannot select CONFIG_AUFS_FS=m for this version, eg. you cannot +build aufs5 as an external kernel module. +Several extra patches are not included in this tree. Only -+aufs5-standalone tree contains them. They are described in the later ++aufs-standalone tree contains them. They are described in the later +section "Configuration and Compilation." + -+On the other hand, the aufs5-standalone tree has only aufs source files ++On the other hand, the aufs-standalone tree has only aufs source files +and necessary patches, and you can select CONFIG_AUFS_FS=m. +But you need to apply all aufs patches manually. + @@ -1618,30 +1621,30 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio +"aufs5.0" is for linux-5.0. For latest "linux-5.x-rcN", use +"aufs5.x-rcN" branch. + -+o aufs5-linux tree ++o aufs-linux tree +$ git clone --reference /your/linux/git/tree \ -+ git://github.com/sfjro/aufs5-linux.git aufs5-linux.git ++ git://github.com/sfjro/aufs-linux.git aufs-linux.git +- if you don't have linux GIT tree, then remove "--reference ..." -+$ cd aufs5-linux.git ++$ cd aufs-linux.git +$ git checkout origin/aufs5.0 + +Or You may want to directly git-pull aufs into your linux GIT tree, and +leave the patch-work to GIT. +$ cd /your/linux/git/tree -+$ git remote add aufs5 git://github.com/sfjro/aufs5-linux.git -+$ git fetch aufs5 ++$ git remote add aufs git://github.com/sfjro/aufs-linux.git ++$ git fetch aufs +$ git checkout -b my5.0 v5.0 +$ (add your local change...) -+$ git pull aufs5 aufs5.0 ++$ git pull aufs aufs5.0 +- now you have v5.0 + your_changes + aufs5.0 in you my5.0 branch. +- you may need to solve some conflicts between your_changes and + aufs5.0. in this case, git-rerere is recommended so that you can + solve the similar conflicts automatically when you upgrade to 5.1 or + later in the future. + -+o aufs5-standalone tree -+$ git clone git://github.com/sfjro/aufs5-standalone.git aufs5-standalone.git -+$ cd aufs5-standalone.git ++o aufs-standalone tree ++$ git clone git://github.com/sfjro/aufs-standalone.git aufs-standalone.git ++$ cd aufs-standalone.git +$ git checkout origin/aufs5.0 + +o aufs-util tree @@ -1676,7 +1679,7 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio +---------------------------------------- +Make sure you have git-checkout'ed the correct branch. + -+For aufs5-linux tree, ++For aufs-linux tree, +- enable CONFIG_AUFS_FS. +- set other aufs configurations if necessary. +- for aufs5.13 and later @@ -1689,8 +1692,10 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio + CONFIG_LOCKDEP_BITS=21 + CONFIG_LOCKDEP_CHAINS_BITS=21 + CONFIG_LOCKDEP_STACK_TRACE_BITS=24 ++ Also you will need to expand some constant values in LOCKDEP. Refer ++ to lockdep-debug.patch in aufs-standalone.git. + -+For aufs5-standalone tree, ++For aufs-standalone tree, +There are several ways to build. + +1. @@ -1750,7 +1755,7 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio + then run "make install_ulib" too. And refer to the aufs manual in + detail. + -+There several other patches in aufs5-standalone.git. They are all ++There several other patches in aufs-standalone.git. They are all +optional. When you meet some problems, they will help you. +- aufs5-loopback.patch + Supports a nested loopback mount in a branch-fs. This patch is @@ -1766,6 +1771,10 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio + duplication of inode number, which is important for backup tools and + other utilities. When you find aufs XINO files for tmpfs branch + growing too much, try this patch. ++- lockdep-debug.patch ++ Similar to some kernel configurations for LOCKDEP (see the top of ++ this section), you will need expand some constants in LOCKDEP for ++ aufs if you enable CONFIG_LOCKDEP. + + +4. Usage @@ -1894,7 +1903,7 @@ diff -Naur null/Documentation/filesystems/aufs/README linux-5.15.41/Documentatio +# End: ; diff -Naur null/fs/aufs/aufs.h linux-5.15.41/fs/aufs/aufs.h --- /dev/null -+++ linux-5.15.41/fs/aufs/aufs.h 2023-01-03 20:33:04.501529216 +0300 ++++ linux-5.15.41/fs/aufs/aufs.h 2023-05-03 13:34:15.654575108 +0300 @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -1960,7 +1969,7 @@ diff -Naur null/fs/aufs/aufs.h linux-5.15.41/fs/aufs/aufs.h +#endif /* __AUFS_H__ */ diff -Naur null/fs/aufs/branch.c linux-5.15.41/fs/aufs/branch.c --- /dev/null -+++ linux-5.15.41/fs/aufs/branch.c 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/branch.c 2023-05-03 13:34:15.654575108 +0300 @@ -0,0 +1,1427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -3391,7 +3400,7 @@ diff -Naur null/fs/aufs/branch.c linux-5.15.41/fs/aufs/branch.c +} diff -Naur null/fs/aufs/branch.h linux-5.15.41/fs/aufs/branch.h --- /dev/null -+++ linux-5.15.41/fs/aufs/branch.h 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/branch.h 2023-05-03 13:34:15.654575108 +0300 @@ -0,0 +1,375 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -3770,7 +3779,7 @@ diff -Naur null/fs/aufs/branch.h linux-5.15.41/fs/aufs/branch.h +#endif /* __AUFS_BRANCH_H__ */ diff -Naur null/fs/aufs/conf.mk linux-5.15.41/fs/aufs/conf.mk --- /dev/null -+++ linux-5.15.41/fs/aufs/conf.mk 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/conf.mk 2023-05-03 13:34:15.654575108 +0300 @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -3814,7 +3823,7 @@ diff -Naur null/fs/aufs/conf.mk linux-5.15.41/fs/aufs/conf.mk +-include ${srctree}/${src}/conf_priv.mk diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c --- /dev/null -+++ linux-5.15.41/fs/aufs/cpup.c 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/cpup.c 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,1459 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5277,7 +5286,7 @@ diff -Naur null/fs/aufs/cpup.c linux-5.15.41/fs/aufs/cpup.c +} diff -Naur null/fs/aufs/cpup.h linux-5.15.41/fs/aufs/cpup.h --- /dev/null -+++ linux-5.15.41/fs/aufs/cpup.h 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/cpup.h 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5381,7 +5390,7 @@ diff -Naur null/fs/aufs/cpup.h linux-5.15.41/fs/aufs/cpup.h +#endif /* __AUFS_CPUP_H__ */ diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.41/fs/aufs/dbgaufs.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dbgaufs.c 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/dbgaufs.c 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,526 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -5911,7 +5920,7 @@ diff -Naur null/fs/aufs/dbgaufs.c linux-5.15.41/fs/aufs/dbgaufs.c +} diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.41/fs/aufs/dbgaufs.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dbgaufs.h 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/dbgaufs.h 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -5968,7 +5977,7 @@ diff -Naur null/fs/aufs/dbgaufs.h linux-5.15.41/fs/aufs/dbgaufs.h +#endif /* __DBGAUFS_H__ */ diff -Naur null/fs/aufs/dcsub.c linux-5.15.41/fs/aufs/dcsub.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dcsub.c 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/dcsub.c 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,225 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6197,7 +6206,7 @@ diff -Naur null/fs/aufs/dcsub.c linux-5.15.41/fs/aufs/dcsub.c +} diff -Naur null/fs/aufs/dcsub.h linux-5.15.41/fs/aufs/dcsub.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dcsub.h 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/dcsub.h 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -6338,7 +6347,7 @@ diff -Naur null/fs/aufs/dcsub.h linux-5.15.41/fs/aufs/dcsub.h +#endif /* __AUFS_DCSUB_H__ */ diff -Naur null/fs/aufs/debug.c linux-5.15.41/fs/aufs/debug.c --- /dev/null -+++ linux-5.15.41/fs/aufs/debug.c 2023-01-03 20:33:04.502529204 +0300 ++++ linux-5.15.41/fs/aufs/debug.c 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,444 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6786,7 +6795,7 @@ diff -Naur null/fs/aufs/debug.c linux-5.15.41/fs/aufs/debug.c +} diff -Naur null/fs/aufs/debug.h linux-5.15.41/fs/aufs/debug.h --- /dev/null -+++ linux-5.15.41/fs/aufs/debug.h 2023-01-03 20:33:04.503529191 +0300 ++++ linux-5.15.41/fs/aufs/debug.h 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,226 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -7016,7 +7025,7 @@ diff -Naur null/fs/aufs/debug.h linux-5.15.41/fs/aufs/debug.h +#endif /* __AUFS_DEBUG_H__ */ diff -Naur null/fs/aufs/dentry.c linux-5.15.41/fs/aufs/dentry.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dentry.c 2023-01-03 20:33:04.503529191 +0300 ++++ linux-5.15.41/fs/aufs/dentry.c 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,1168 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -8188,7 +8197,7 @@ diff -Naur null/fs/aufs/dentry.c linux-5.15.41/fs/aufs/dentry.c +}; diff -Naur null/fs/aufs/dentry.h linux-5.15.41/fs/aufs/dentry.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dentry.h 2023-01-03 20:33:04.503529191 +0300 ++++ linux-5.15.41/fs/aufs/dentry.h 2023-05-03 13:34:15.655575095 +0300 @@ -0,0 +1,269 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -8461,7 +8470,7 @@ diff -Naur null/fs/aufs/dentry.h linux-5.15.41/fs/aufs/dentry.h +#endif /* __AUFS_DENTRY_H__ */ diff -Naur null/fs/aufs/dinfo.c linux-5.15.41/fs/aufs/dinfo.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dinfo.c 2023-01-03 20:33:04.503529191 +0300 ++++ linux-5.15.41/fs/aufs/dinfo.c 2023-05-03 13:34:15.656575083 +0300 @@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9019,7 +9028,7 @@ diff -Naur null/fs/aufs/dinfo.c linux-5.15.41/fs/aufs/dinfo.c +} diff -Naur null/fs/aufs/dir.c linux-5.15.41/fs/aufs/dir.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dir.c 2023-01-03 20:33:04.503529191 +0300 ++++ linux-5.15.41/fs/aufs/dir.c 2023-05-03 13:34:15.656575083 +0300 @@ -0,0 +1,765 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9788,7 +9797,7 @@ diff -Naur null/fs/aufs/dir.c linux-5.15.41/fs/aufs/dir.c +}; diff -Naur null/fs/aufs/dir.h linux-5.15.41/fs/aufs/dir.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dir.h 2023-01-03 20:33:04.503529191 +0300 ++++ linux-5.15.41/fs/aufs/dir.h 2023-05-03 13:34:15.656575083 +0300 @@ -0,0 +1,134 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -9926,7 +9935,7 @@ diff -Naur null/fs/aufs/dir.h linux-5.15.41/fs/aufs/dir.h +#endif /* __AUFS_DIR_H__ */ diff -Naur null/fs/aufs/dirren.c linux-5.15.41/fs/aufs/dirren.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dirren.c 2023-01-03 20:33:04.503529191 +0300 ++++ linux-5.15.41/fs/aufs/dirren.c 2023-05-03 13:34:15.656575083 +0300 @@ -0,0 +1,1315 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11245,7 +11254,7 @@ diff -Naur null/fs/aufs/dirren.c linux-5.15.41/fs/aufs/dirren.c +} diff -Naur null/fs/aufs/dirren.h linux-5.15.41/fs/aufs/dirren.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dirren.h 2023-01-03 20:33:04.503529191 +0300 ++++ linux-5.15.41/fs/aufs/dirren.h 2023-05-03 13:34:15.656575083 +0300 @@ -0,0 +1,140 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11389,7 +11398,7 @@ diff -Naur null/fs/aufs/dirren.h linux-5.15.41/fs/aufs/dirren.h +#endif /* __AUFS_DIRREN_H__ */ diff -Naur null/fs/aufs/dynop.c linux-5.15.41/fs/aufs/dynop.c --- /dev/null -+++ linux-5.15.41/fs/aufs/dynop.c 2023-01-03 20:33:04.504529179 +0300 ++++ linux-5.15.41/fs/aufs/dynop.c 2023-05-03 13:34:15.656575083 +0300 @@ -0,0 +1,368 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -11761,7 +11770,7 @@ diff -Naur null/fs/aufs/dynop.c linux-5.15.41/fs/aufs/dynop.c +} diff -Naur null/fs/aufs/dynop.h linux-5.15.41/fs/aufs/dynop.h --- /dev/null -+++ linux-5.15.41/fs/aufs/dynop.h 2023-01-03 20:33:04.504529179 +0300 ++++ linux-5.15.41/fs/aufs/dynop.h 2023-05-03 13:34:15.656575083 +0300 @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -11842,7 +11851,7 @@ diff -Naur null/fs/aufs/dynop.h linux-5.15.41/fs/aufs/dynop.h +#endif /* __AUFS_DYNOP_H__ */ diff -Naur null/fs/aufs/export.c linux-5.15.41/fs/aufs/export.c --- /dev/null -+++ linux-5.15.41/fs/aufs/export.c 2023-01-03 20:33:04.504529179 +0300 ++++ linux-5.15.41/fs/aufs/export.c 2023-05-03 13:34:15.656575083 +0300 @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -12676,7 +12685,7 @@ diff -Naur null/fs/aufs/export.c linux-5.15.41/fs/aufs/export.c +} diff -Naur null/fs/aufs/fhsm.c linux-5.15.41/fs/aufs/fhsm.c --- /dev/null -+++ linux-5.15.41/fs/aufs/fhsm.c 2023-01-03 20:33:04.504529179 +0300 ++++ linux-5.15.41/fs/aufs/fhsm.c 2023-05-03 13:34:15.657575070 +0300 @@ -0,0 +1,427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13107,7 +13116,7 @@ diff -Naur null/fs/aufs/fhsm.c linux-5.15.41/fs/aufs/fhsm.c +} diff -Naur null/fs/aufs/file.c linux-5.15.41/fs/aufs/file.c --- /dev/null -+++ linux-5.15.41/fs/aufs/file.c 2023-01-03 20:33:04.504529179 +0300 ++++ linux-5.15.41/fs/aufs/file.c 2023-05-03 13:34:15.657575070 +0300 @@ -0,0 +1,863 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13974,7 +13983,7 @@ diff -Naur null/fs/aufs/file.c linux-5.15.41/fs/aufs/file.c +}; diff -Naur null/fs/aufs/file.h linux-5.15.41/fs/aufs/file.h --- /dev/null -+++ linux-5.15.41/fs/aufs/file.h 2023-01-03 20:33:04.504529179 +0300 ++++ linux-5.15.41/fs/aufs/file.h 2023-05-03 13:34:15.657575070 +0300 @@ -0,0 +1,342 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -14320,7 +14329,7 @@ diff -Naur null/fs/aufs/file.h linux-5.15.41/fs/aufs/file.h +#endif /* __AUFS_FILE_H__ */ diff -Naur null/fs/aufs/finfo.c linux-5.15.41/fs/aufs/finfo.c --- /dev/null -+++ linux-5.15.41/fs/aufs/finfo.c 2023-01-03 20:33:04.504529179 +0300 ++++ linux-5.15.41/fs/aufs/finfo.c 2023-05-03 13:34:15.657575070 +0300 @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -14473,7 +14482,7 @@ diff -Naur null/fs/aufs/finfo.c linux-5.15.41/fs/aufs/finfo.c +} diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c --- /dev/null -+++ linux-5.15.41/fs/aufs/f_op.c 2023-01-03 20:33:04.504529179 +0300 ++++ linux-5.15.41/fs/aufs/f_op.c 2023-05-03 13:34:15.657575070 +0300 @@ -0,0 +1,775 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -15252,7 +15261,7 @@ diff -Naur null/fs/aufs/f_op.c linux-5.15.41/fs/aufs/f_op.c +}; diff -Naur null/fs/aufs/fsctx.c linux-5.15.41/fs/aufs/fsctx.c --- /dev/null -+++ linux-5.15.41/fs/aufs/fsctx.c 2023-01-03 20:33:04.505529166 +0300 ++++ linux-5.15.41/fs/aufs/fsctx.c 2023-05-03 13:34:15.657575070 +0300 @@ -0,0 +1,1242 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -16498,7 +16507,7 @@ diff -Naur null/fs/aufs/fsctx.c linux-5.15.41/fs/aufs/fsctx.c +} diff -Naur null/fs/aufs/fstype.h linux-5.15.41/fs/aufs/fstype.h --- /dev/null -+++ linux-5.15.41/fs/aufs/fstype.h 2023-01-03 20:33:04.505529166 +0300 ++++ linux-5.15.41/fs/aufs/fstype.h 2023-05-03 13:34:15.657575070 +0300 @@ -0,0 +1,401 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -16903,7 +16912,7 @@ diff -Naur null/fs/aufs/fstype.h linux-5.15.41/fs/aufs/fstype.h +#endif /* __AUFS_FSTYPE_H__ */ diff -Naur null/fs/aufs/hbl.h linux-5.15.41/fs/aufs/hbl.h --- /dev/null -+++ linux-5.15.41/fs/aufs/hbl.h 2023-01-03 20:33:04.505529166 +0300 ++++ linux-5.15.41/fs/aufs/hbl.h 2023-05-03 13:34:15.657575070 +0300 @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -16972,7 +16981,7 @@ diff -Naur null/fs/aufs/hbl.h linux-5.15.41/fs/aufs/hbl.h +#endif /* __AUFS_HBL_H__ */ diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.41/fs/aufs/hfsnotify.c --- /dev/null -+++ linux-5.15.41/fs/aufs/hfsnotify.c 2023-01-03 20:33:04.505529166 +0300 ++++ linux-5.15.41/fs/aufs/hfsnotify.c 2023-05-03 13:34:15.657575070 +0300 @@ -0,0 +1,288 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17264,7 +17273,7 @@ diff -Naur null/fs/aufs/hfsnotify.c linux-5.15.41/fs/aufs/hfsnotify.c +}; diff -Naur null/fs/aufs/hfsplus.c linux-5.15.41/fs/aufs/hfsplus.c --- /dev/null -+++ linux-5.15.41/fs/aufs/hfsplus.c 2023-01-03 20:33:04.505529166 +0300 ++++ linux-5.15.41/fs/aufs/hfsplus.c 2023-05-03 13:34:15.658575058 +0300 @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -17328,7 +17337,7 @@ diff -Naur null/fs/aufs/hfsplus.c linux-5.15.41/fs/aufs/hfsplus.c +} diff -Naur null/fs/aufs/hnotify.c linux-5.15.41/fs/aufs/hnotify.c --- /dev/null -+++ linux-5.15.41/fs/aufs/hnotify.c 2023-01-03 20:33:04.505529166 +0300 ++++ linux-5.15.41/fs/aufs/hnotify.c 2023-05-03 13:34:15.658575058 +0300 @@ -0,0 +1,715 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18047,7 +18056,7 @@ diff -Naur null/fs/aufs/hnotify.c linux-5.15.41/fs/aufs/hnotify.c +} diff -Naur null/fs/aufs/iinfo.c linux-5.15.41/fs/aufs/iinfo.c --- /dev/null -+++ linux-5.15.41/fs/aufs/iinfo.c 2023-01-03 20:33:04.506529154 +0300 ++++ linux-5.15.41/fs/aufs/iinfo.c 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18337,7 +18346,7 @@ diff -Naur null/fs/aufs/iinfo.c linux-5.15.41/fs/aufs/iinfo.c +} diff -Naur null/fs/aufs/inode.c linux-5.15.41/fs/aufs/inode.c --- /dev/null -+++ linux-5.15.41/fs/aufs/inode.c 2023-01-03 20:33:04.506529154 +0300 ++++ linux-5.15.41/fs/aufs/inode.c 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,531 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18872,7 +18881,7 @@ diff -Naur null/fs/aufs/inode.c linux-5.15.41/fs/aufs/inode.c +} diff -Naur null/fs/aufs/inode.h linux-5.15.41/fs/aufs/inode.h --- /dev/null -+++ linux-5.15.41/fs/aufs/inode.h 2023-01-03 20:33:04.506529154 +0300 ++++ linux-5.15.41/fs/aufs/inode.h 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,705 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -19581,7 +19590,7 @@ diff -Naur null/fs/aufs/inode.h linux-5.15.41/fs/aufs/inode.h +#endif /* __AUFS_INODE_H__ */ diff -Naur null/fs/aufs/ioctl.c linux-5.15.41/fs/aufs/ioctl.c --- /dev/null -+++ linux-5.15.41/fs/aufs/ioctl.c 2023-01-03 20:33:04.506529154 +0300 ++++ linux-5.15.41/fs/aufs/ioctl.c 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -19805,7 +19814,7 @@ diff -Naur null/fs/aufs/ioctl.c linux-5.15.41/fs/aufs/ioctl.c +#endif diff -Naur null/fs/aufs/i_op_add.c linux-5.15.41/fs/aufs/i_op_add.c --- /dev/null -+++ linux-5.15.41/fs/aufs/i_op_add.c 2023-01-03 20:33:04.505529166 +0300 ++++ linux-5.15.41/fs/aufs/i_op_add.c 2023-05-03 13:34:15.658575058 +0300 @@ -0,0 +1,941 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -20750,7 +20759,7 @@ diff -Naur null/fs/aufs/i_op_add.c linux-5.15.41/fs/aufs/i_op_add.c +} diff -Naur null/fs/aufs/i_op.c linux-5.15.41/fs/aufs/i_op.c --- /dev/null -+++ linux-5.15.41/fs/aufs/i_op.c 2023-01-03 20:33:04.505529166 +0300 ++++ linux-5.15.41/fs/aufs/i_op.c 2023-05-03 13:34:15.658575058 +0300 @@ -0,0 +1,1512 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22266,7 +22275,7 @@ diff -Naur null/fs/aufs/i_op.c linux-5.15.41/fs/aufs/i_op.c +}; diff -Naur null/fs/aufs/i_op_del.c linux-5.15.41/fs/aufs/i_op_del.c --- /dev/null -+++ linux-5.15.41/fs/aufs/i_op_del.c 2023-01-03 20:33:04.506529154 +0300 ++++ linux-5.15.41/fs/aufs/i_op_del.c 2023-05-03 13:34:15.658575058 +0300 @@ -0,0 +1,522 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22792,7 +22801,7 @@ diff -Naur null/fs/aufs/i_op_del.c linux-5.15.41/fs/aufs/i_op_del.c +} diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.41/fs/aufs/i_op_ren.c --- /dev/null -+++ linux-5.15.41/fs/aufs/i_op_ren.c 2023-01-03 20:33:04.506529154 +0300 ++++ linux-5.15.41/fs/aufs/i_op_ren.c 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,1257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24053,7 +24062,7 @@ diff -Naur null/fs/aufs/i_op_ren.c linux-5.15.41/fs/aufs/i_op_ren.c +} diff -Naur null/fs/aufs/Kconfig linux-5.15.41/fs/aufs/Kconfig --- /dev/null -+++ linux-5.15.41/fs/aufs/Kconfig 2023-01-03 20:33:04.501529216 +0300 ++++ linux-5.15.41/fs/aufs/Kconfig 2023-05-03 13:34:15.654575108 +0300 @@ -0,0 +1,199 @@ +# SPDX-License-Identifier: GPL-2.0 +config AUFS_FS @@ -24256,7 +24265,7 @@ diff -Naur null/fs/aufs/Kconfig linux-5.15.41/fs/aufs/Kconfig +endif diff -Naur null/fs/aufs/lcnt.h linux-5.15.41/fs/aufs/lcnt.h --- /dev/null -+++ linux-5.15.41/fs/aufs/lcnt.h 2023-01-03 20:33:04.506529154 +0300 ++++ linux-5.15.41/fs/aufs/lcnt.h 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,186 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24446,7 +24455,7 @@ diff -Naur null/fs/aufs/lcnt.h linux-5.15.41/fs/aufs/lcnt.h +#endif /* __AUFS_LCNT_H__ */ diff -Naur null/fs/aufs/loop.c linux-5.15.41/fs/aufs/loop.c --- /dev/null -+++ linux-5.15.41/fs/aufs/loop.c 2023-01-03 20:33:04.506529154 +0300 ++++ linux-5.15.41/fs/aufs/loop.c 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24598,7 +24607,7 @@ diff -Naur null/fs/aufs/loop.c linux-5.15.41/fs/aufs/loop.c +} diff -Naur null/fs/aufs/loop.h linux-5.15.41/fs/aufs/loop.h --- /dev/null -+++ linux-5.15.41/fs/aufs/loop.h 2023-01-03 20:33:04.506529154 +0300 ++++ linux-5.15.41/fs/aufs/loop.h 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24657,7 +24666,7 @@ diff -Naur null/fs/aufs/loop.h linux-5.15.41/fs/aufs/loop.h +#endif /* __AUFS_LOOP_H__ */ diff -Naur null/fs/aufs/magic.mk linux-5.15.41/fs/aufs/magic.mk --- /dev/null -+++ linux-5.15.41/fs/aufs/magic.mk 2023-01-03 20:33:04.507529141 +0300 ++++ linux-5.15.41/fs/aufs/magic.mk 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -24692,7 +24701,7 @@ diff -Naur null/fs/aufs/magic.mk linux-5.15.41/fs/aufs/magic.mk +endif diff -Naur null/fs/aufs/Makefile linux-5.15.41/fs/aufs/Makefile --- /dev/null -+++ linux-5.15.41/fs/aufs/Makefile 2023-01-03 20:33:04.501529216 +0300 ++++ linux-5.15.41/fs/aufs/Makefile 2023-05-03 13:34:15.654575108 +0300 @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -24742,7 +24751,7 @@ diff -Naur null/fs/aufs/Makefile linux-5.15.41/fs/aufs/Makefile +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o diff -Naur null/fs/aufs/module.c linux-5.15.41/fs/aufs/module.c --- /dev/null -+++ linux-5.15.41/fs/aufs/module.c 2023-01-03 20:33:04.507529141 +0300 ++++ linux-5.15.41/fs/aufs/module.c 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,273 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25019,7 +25028,7 @@ diff -Naur null/fs/aufs/module.c linux-5.15.41/fs/aufs/module.c +module_exit(aufs_exit); diff -Naur null/fs/aufs/module.h linux-5.15.41/fs/aufs/module.h --- /dev/null -+++ linux-5.15.41/fs/aufs/module.h 2023-01-03 20:33:04.507529141 +0300 ++++ linux-5.15.41/fs/aufs/module.h 2023-05-03 13:34:15.659575045 +0300 @@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -25189,7 +25198,7 @@ diff -Naur null/fs/aufs/module.h linux-5.15.41/fs/aufs/module.h +#endif /* __AUFS_MODULE_H__ */ diff -Naur null/fs/aufs/mvdown.c linux-5.15.41/fs/aufs/mvdown.c --- /dev/null -+++ linux-5.15.41/fs/aufs/mvdown.c 2023-01-03 20:33:04.507529141 +0300 ++++ linux-5.15.41/fs/aufs/mvdown.c 2023-05-03 13:34:15.660575033 +0300 @@ -0,0 +1,706 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25899,7 +25908,7 @@ diff -Naur null/fs/aufs/mvdown.c linux-5.15.41/fs/aufs/mvdown.c +} diff -Naur null/fs/aufs/opts.c linux-5.15.41/fs/aufs/opts.c --- /dev/null -+++ linux-5.15.41/fs/aufs/opts.c 2023-01-03 20:33:04.507529141 +0300 ++++ linux-5.15.41/fs/aufs/opts.c 2023-05-03 13:34:15.660575033 +0300 @@ -0,0 +1,1032 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -26935,7 +26944,7 @@ diff -Naur null/fs/aufs/opts.c linux-5.15.41/fs/aufs/opts.c +} diff -Naur null/fs/aufs/opts.h linux-5.15.41/fs/aufs/opts.h --- /dev/null -+++ linux-5.15.41/fs/aufs/opts.h 2023-01-03 20:33:04.507529141 +0300 ++++ linux-5.15.41/fs/aufs/opts.h 2023-05-03 13:34:15.660575033 +0300 @@ -0,0 +1,263 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -27202,7 +27211,7 @@ diff -Naur null/fs/aufs/opts.h linux-5.15.41/fs/aufs/opts.h +#endif /* __AUFS_OPTS_H__ */ diff -Naur null/fs/aufs/plink.c linux-5.15.41/fs/aufs/plink.c --- /dev/null -+++ linux-5.15.41/fs/aufs/plink.c 2023-01-03 20:33:04.507529141 +0300 ++++ linux-5.15.41/fs/aufs/plink.c 2023-05-03 13:34:15.660575033 +0300 @@ -0,0 +1,516 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27722,7 +27731,7 @@ diff -Naur null/fs/aufs/plink.c linux-5.15.41/fs/aufs/plink.c +} diff -Naur null/fs/aufs/poll.c linux-5.15.41/fs/aufs/poll.c --- /dev/null -+++ linux-5.15.41/fs/aufs/poll.c 2023-01-03 20:33:04.507529141 +0300 ++++ linux-5.15.41/fs/aufs/poll.c 2023-05-03 13:34:15.660575033 +0300 @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27777,7 +27786,7 @@ diff -Naur null/fs/aufs/poll.c linux-5.15.41/fs/aufs/poll.c +} diff -Naur null/fs/aufs/posix_acl.c linux-5.15.41/fs/aufs/posix_acl.c --- /dev/null -+++ linux-5.15.41/fs/aufs/posix_acl.c 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/posix_acl.c 2023-05-03 13:34:15.660575033 +0300 @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27892,7 +27901,7 @@ diff -Naur null/fs/aufs/posix_acl.c linux-5.15.41/fs/aufs/posix_acl.c +} diff -Naur null/fs/aufs/procfs.c linux-5.15.41/fs/aufs/procfs.c --- /dev/null -+++ linux-5.15.41/fs/aufs/procfs.c 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/procfs.c 2023-05-03 13:34:15.660575033 +0300 @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28066,7 +28075,7 @@ diff -Naur null/fs/aufs/procfs.c linux-5.15.41/fs/aufs/procfs.c +} diff -Naur null/fs/aufs/rdu.c linux-5.15.41/fs/aufs/rdu.c --- /dev/null -+++ linux-5.15.41/fs/aufs/rdu.c 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/rdu.c 2023-05-03 13:34:15.660575033 +0300 @@ -0,0 +1,384 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28454,7 +28463,7 @@ diff -Naur null/fs/aufs/rdu.c linux-5.15.41/fs/aufs/rdu.c +#endif diff -Naur null/fs/aufs/rwsem.h linux-5.15.41/fs/aufs/rwsem.h --- /dev/null -+++ linux-5.15.41/fs/aufs/rwsem.h 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/rwsem.h 2023-05-03 13:34:15.660575033 +0300 @@ -0,0 +1,85 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -28543,7 +28552,7 @@ diff -Naur null/fs/aufs/rwsem.h linux-5.15.41/fs/aufs/rwsem.h +#endif /* __AUFS_RWSEM_H__ */ diff -Naur null/fs/aufs/sbinfo.c linux-5.15.41/fs/aufs/sbinfo.c --- /dev/null -+++ linux-5.15.41/fs/aufs/sbinfo.c 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/sbinfo.c 2023-05-03 13:34:15.661575020 +0300 @@ -0,0 +1,316 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28863,7 +28872,7 @@ diff -Naur null/fs/aufs/sbinfo.c linux-5.15.41/fs/aufs/sbinfo.c +} diff -Naur null/fs/aufs/super.c linux-5.15.41/fs/aufs/super.c --- /dev/null -+++ linux-5.15.41/fs/aufs/super.c 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/super.c 2023-05-03 13:34:15.661575020 +0300 @@ -0,0 +1,871 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29738,7 +29747,7 @@ diff -Naur null/fs/aufs/super.c linux-5.15.41/fs/aufs/super.c +}; diff -Naur null/fs/aufs/super.h linux-5.15.41/fs/aufs/super.h --- /dev/null -+++ linux-5.15.41/fs/aufs/super.h 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/super.h 2023-05-03 13:34:15.661575020 +0300 @@ -0,0 +1,592 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -30334,7 +30343,7 @@ diff -Naur null/fs/aufs/super.h linux-5.15.41/fs/aufs/super.h +#endif /* __AUFS_SUPER_H__ */ diff -Naur null/fs/aufs/sysaufs.c linux-5.15.41/fs/aufs/sysaufs.c --- /dev/null -+++ linux-5.15.41/fs/aufs/sysaufs.c 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/sysaufs.c 2023-05-03 13:34:15.661575020 +0300 @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30431,7 +30440,7 @@ diff -Naur null/fs/aufs/sysaufs.c linux-5.15.41/fs/aufs/sysaufs.c +} diff -Naur null/fs/aufs/sysaufs.h linux-5.15.41/fs/aufs/sysaufs.h --- /dev/null -+++ linux-5.15.41/fs/aufs/sysaufs.h 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/sysaufs.h 2023-05-03 13:34:15.661575020 +0300 @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -30537,7 +30546,7 @@ diff -Naur null/fs/aufs/sysaufs.h linux-5.15.41/fs/aufs/sysaufs.h +#endif /* __SYSAUFS_H__ */ diff -Naur null/fs/aufs/sysfs.c linux-5.15.41/fs/aufs/sysfs.c --- /dev/null -+++ linux-5.15.41/fs/aufs/sysfs.c 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/sysfs.c 2023-05-03 13:34:15.661575020 +0300 @@ -0,0 +1,374 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30915,7 +30924,7 @@ diff -Naur null/fs/aufs/sysfs.c linux-5.15.41/fs/aufs/sysfs.c +} diff -Naur null/fs/aufs/sysrq.c linux-5.15.41/fs/aufs/sysrq.c --- /dev/null -+++ linux-5.15.41/fs/aufs/sysrq.c 2023-01-03 20:33:04.508529129 +0300 ++++ linux-5.15.41/fs/aufs/sysrq.c 2023-05-03 13:34:15.661575020 +0300 @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31068,7 +31077,7 @@ diff -Naur null/fs/aufs/sysrq.c linux-5.15.41/fs/aufs/sysrq.c +} diff -Naur null/fs/aufs/vdir.c linux-5.15.41/fs/aufs/vdir.c --- /dev/null -+++ linux-5.15.41/fs/aufs/vdir.c 2023-01-03 20:33:04.509529116 +0300 ++++ linux-5.15.41/fs/aufs/vdir.c 2023-05-03 13:34:15.661575020 +0300 @@ -0,0 +1,896 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31968,7 +31977,7 @@ diff -Naur null/fs/aufs/vdir.c linux-5.15.41/fs/aufs/vdir.c +} diff -Naur null/fs/aufs/vfsub.c linux-5.15.41/fs/aufs/vfsub.c --- /dev/null -+++ linux-5.15.41/fs/aufs/vfsub.c 2023-01-03 20:33:04.509529116 +0300 ++++ linux-5.15.41/fs/aufs/vfsub.c 2023-05-03 13:34:15.662575008 +0300 @@ -0,0 +1,918 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -32890,7 +32899,7 @@ diff -Naur null/fs/aufs/vfsub.c linux-5.15.41/fs/aufs/vfsub.c +} diff -Naur null/fs/aufs/vfsub.h linux-5.15.41/fs/aufs/vfsub.h --- /dev/null -+++ linux-5.15.41/fs/aufs/vfsub.h 2023-01-03 20:33:04.509529116 +0300 ++++ linux-5.15.41/fs/aufs/vfsub.h 2023-05-03 13:34:15.662575008 +0300 @@ -0,0 +1,358 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -33252,7 +33261,7 @@ diff -Naur null/fs/aufs/vfsub.h linux-5.15.41/fs/aufs/vfsub.h +#endif /* __AUFS_VFSUB_H__ */ diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.41/fs/aufs/wbr_policy.c --- /dev/null -+++ linux-5.15.41/fs/aufs/wbr_policy.c 2023-01-03 20:33:04.509529116 +0300 ++++ linux-5.15.41/fs/aufs/wbr_policy.c 2023-05-03 13:34:15.662575008 +0300 @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -34086,7 +34095,7 @@ diff -Naur null/fs/aufs/wbr_policy.c linux-5.15.41/fs/aufs/wbr_policy.c +}; diff -Naur null/fs/aufs/whout.c linux-5.15.41/fs/aufs/whout.c --- /dev/null -+++ linux-5.15.41/fs/aufs/whout.c 2023-01-03 20:33:04.509529116 +0300 ++++ linux-5.15.41/fs/aufs/whout.c 2023-05-03 13:34:15.662575008 +0300 @@ -0,0 +1,1072 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35162,7 +35171,7 @@ diff -Naur null/fs/aufs/whout.c linux-5.15.41/fs/aufs/whout.c +} diff -Naur null/fs/aufs/whout.h linux-5.15.41/fs/aufs/whout.h --- /dev/null -+++ linux-5.15.41/fs/aufs/whout.h 2023-01-03 20:33:04.509529116 +0300 ++++ linux-5.15.41/fs/aufs/whout.h 2023-05-03 13:34:15.662575008 +0300 @@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -35253,7 +35262,7 @@ diff -Naur null/fs/aufs/whout.h linux-5.15.41/fs/aufs/whout.h +#endif /* __AUFS_WHOUT_H__ */ diff -Naur null/fs/aufs/wkq.c linux-5.15.41/fs/aufs/wkq.c --- /dev/null -+++ linux-5.15.41/fs/aufs/wkq.c 2023-01-03 20:33:04.509529116 +0300 ++++ linux-5.15.41/fs/aufs/wkq.c 2023-05-03 13:34:15.662575008 +0300 @@ -0,0 +1,372 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35629,7 +35638,7 @@ diff -Naur null/fs/aufs/wkq.c linux-5.15.41/fs/aufs/wkq.c +} diff -Naur null/fs/aufs/wkq.h linux-5.15.41/fs/aufs/wkq.h --- /dev/null -+++ linux-5.15.41/fs/aufs/wkq.h 2023-01-03 20:33:04.510529104 +0300 ++++ linux-5.15.41/fs/aufs/wkq.h 2023-05-03 13:34:15.662575008 +0300 @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -35722,7 +35731,7 @@ diff -Naur null/fs/aufs/wkq.h linux-5.15.41/fs/aufs/wkq.h +#endif /* __AUFS_WKQ_H__ */ diff -Naur null/fs/aufs/xattr.c linux-5.15.41/fs/aufs/xattr.c --- /dev/null -+++ linux-5.15.41/fs/aufs/xattr.c 2023-01-03 20:33:04.510529104 +0300 ++++ linux-5.15.41/fs/aufs/xattr.c 2023-05-03 13:34:15.662575008 +0300 @@ -0,0 +1,368 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -36094,7 +36103,7 @@ diff -Naur null/fs/aufs/xattr.c linux-5.15.41/fs/aufs/xattr.c +} diff -Naur null/fs/aufs/xino.c linux-5.15.41/fs/aufs/xino.c --- /dev/null -+++ linux-5.15.41/fs/aufs/xino.c 2023-01-03 20:33:04.510529104 +0300 ++++ linux-5.15.41/fs/aufs/xino.c 2023-05-03 13:34:15.663574995 +0300 @@ -0,0 +1,1926 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -38024,7 +38033,7 @@ diff -Naur null/fs/aufs/xino.c linux-5.15.41/fs/aufs/xino.c +} diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.41/include/uapi/linux/aufs_type.h --- /dev/null -+++ linux-5.15.41/include/uapi/linux/aufs_type.h 2023-01-03 20:33:04.510529104 +0300 ++++ linux-5.15.41/include/uapi/linux/aufs_type.h 2023-05-03 13:34:15.663574995 +0300 @@ -0,0 +1,452 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* @@ -38068,7 +38077,7 @@ diff -Naur null/include/uapi/linux/aufs_type.h linux-5.15.41/include/uapi/linux/ +#include +#endif /* __KERNEL__ */ + -+#define AUFS_VERSION "5.15.41-20221219" ++#define AUFS_VERSION "5.15.41-20230227" + +/* 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/cpupowertools/files/patches/aufs5/lockdep-debug.patch b/kernel/tools/cpupowertools/files/patches/aufs5/lockdep-debug.patch new file mode 100644 index 00000000..d473b8d9 --- /dev/null +++ b/kernel/tools/cpupowertools/files/patches/aufs5/lockdep-debug.patch @@ -0,0 +1,16 @@ +SPDX-License-Identifier: GPL-2.0 +aufs5.15.41 lockdep patch + +diff --git a/include/linux/lockdep_types.h b/include/linux/lockdep_types.h +index 3e726ace5c62..ae7bf46a7a68 100644 +--- a/include/linux/lockdep_types.h ++++ b/include/linux/lockdep_types.h +@@ -12,7 +12,7 @@ + + #include + +-#define MAX_LOCKDEP_SUBCLASSES 8UL ++#define MAX_LOCKDEP_SUBCLASSES (8UL + 4) + + enum lockdep_wait_type { + LD_WAIT_INV = 0, /* not checked, catch all */ diff --git a/kernel/tools/cpupowertools/files/patches/linux/patch-5.15.110.xz b/kernel/tools/cpupowertools/files/patches/linux/patch-5.15.110.xz new file mode 100644 index 00000000..bd50f4a6 Binary files /dev/null and b/kernel/tools/cpupowertools/files/patches/linux/patch-5.15.110.xz differ diff --git a/kernel/tools/cpupowertools/pspec.xml b/kernel/tools/cpupowertools/pspec.xml index 8775a308..0e88e370 100644 --- a/kernel/tools/cpupowertools/pspec.xml +++ b/kernel/tools/cpupowertools/pspec.xml @@ -18,13 +18,14 @@ - patches/linux/patch-5.15.102.xz + patches/linux/patch-5.15.110.xz - patches/aufs5/aufs5.15.41-20221219.patch + patches/aufs5/aufs5.15.41-20230227.patch patches/aufs5/aufs5-base.patch - patches/aufs5/aufs5-kbuild.patch patches/aufs5/aufs5-loopback.patch + patches/aufs5/aufs5-kbuild.patch + patches/aufs5/lockdep-debug.patch patches/aufs5/aufs5-mmap.patch patches/aufs5/tmpfs-idr.patch patches/aufs5/vfs-ino.patch @@ -109,6 +110,13 @@ + + 2023-05-03 + 5.15.110 + Version bump + Mustafa Cinasal + muscnsl@gmail.com + 2023-03-15 5.15.102