[packages/kernel] - up to 5.14.1
baggins
baggins at pld-linux.org
Mon Sep 6 22:34:45 CEST 2021
commit 6d1765514cb22667c025eb69327c29f5a698444f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Sep 6 22:34:06 2021 +0200
- up to 5.14.1
kernel-aufs5.patch | 560 ++++++++++++++++++++++++------------------------
kernel-multiarch.config | 306 +++++++++++++++++---------
kernel.spec | 55 +----
3 files changed, 484 insertions(+), 437 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 7b2c9f80..aedeb69b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -41,11 +41,6 @@
%{?debug:%define with_verbose 1}
%define have_drm 1
-%ifarch %{ix86} %{x8664} x32 alpha %{arm} ia64 ppc ppc64 sparc sparc64
-%define have_ide 1
-%else
-%define have_ide 0
-%endif
%define have_sound 1
%define have_pcmcia 1
@@ -57,7 +52,6 @@
%if %{with myown}
%define have_drm 0
-%define have_ide 0
%define have_sound 0
%define have_pcmcia 0
%endif
@@ -72,8 +66,8 @@
%endif
%define rel 1
-%define basever 5.13
-%define postver .7
+%define basever 5.14
+%define postver .1
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -124,10 +118,10 @@ Epoch: 3
License: GPL v2
Group: Base/Kernel
Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: 76c60fb304510a7bbd9c838790bc5fe4
+# Source0-md5: a082ef5748b813abca0649dab8be5f52
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5: aebc49e4d58bd8314548a364bec99d1e
+# Patch0-md5: 0e03bc49d0db9ae31a5086ec49be3768
%endif
Source1: kernel.sysconfig
@@ -466,24 +460,6 @@ DRM Kernel Treiber.
%description drm -l pl.UTF-8
Sterowniki DRM.
-%package ide
-Summary: IDE kernel modules
-Summary(de.UTF-8): IDE Kernel Treiber
-Summary(pl.UTF-8): Sterowniki IDE
-Group: Base/Kernel
-Requires(postun): %{name} = %{epoch}:%{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-AutoReqProv: no
-
-%description ide
-IDE kernel modules.
-
-%description ide -l de.UTF-8
-IDE Kernel Treiber.
-
-%description ide -l pl.UTF-8
-Sterowniki IDE.
-
%package pcmcia
Summary: PCMCIA modules
Summary(de.UTF-8): PCMCIA Module
@@ -749,6 +725,7 @@ find -name '*.pl' -print0 | \
scripts/stackdelta
%{__sed} -i -e '1s,/usr/bin/env bash,%{__bash},' \
+ tools/testing/selftests/powerpc/security/mitigation-patching.sh \
scripts/config
%build
@@ -1220,12 +1197,6 @@ fi
%postun drm
%depmod %{kernel_release}
-%post ide
-%depmod %{kernel_release}
-
-%postun ide
-%depmod %{kernel_release}
-
%post pcmcia
%depmod %{kernel_release}
@@ -1286,9 +1257,6 @@ fi
%if %{have_drm}
%exclude /lib/modules/%{kernel_release}/kernel/drivers/gpu
%endif
-%if %{have_ide}
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/*
-%endif
/lib/modules/%{kernel_release}/kernel/fs
/lib/modules/%{kernel_release}/kernel/kernel
/lib/modules/%{kernel_release}/kernel/lib
@@ -1317,7 +1285,6 @@ fi
%exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
%exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
%endif
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/arcnet/com20020_cs.ko*
%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/can/softing/softing_cs.ko*
%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c574_cs.ko*
@@ -1379,15 +1346,6 @@ fi
/lib/modules/%{kernel_release}/kernel/drivers/gpu
%endif
-%if %{have_ide}
-%files ide
-%defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/drivers/ide/*
-%if %{have_pcmcia}
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
-%endif
-%endif
-
%if %{have_pcmcia}
%files pcmcia
%defattr(644,root,root,755)
@@ -1398,7 +1356,6 @@ fi
/lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
/lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
%endif
-/lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
/lib/modules/%{kernel_release}/kernel/drivers/net/arcnet/com20020_cs.ko*
/lib/modules/%{kernel_release}/kernel/drivers/net/can/softing/softing_cs.ko*
/lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c574_cs.ko*
@@ -1482,7 +1439,6 @@ fi
%{_kernelsrcdir}/scripts/mod/*.c
%{_kernelsrcdir}/scripts/mod/modpost.h
%attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h
-%{_kernelsrcdir}/scripts/mkmakefile
%attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
%{_kernelsrcdir}/scripts/subarch.include
%{_kernelsrcdir}/scripts/*.c
@@ -1550,7 +1506,6 @@ fi
%exclude %{_kernelsrcdir}/scripts/basic
%exclude %{_kernelsrcdir}/scripts/kconfig
%exclude %{_kernelsrcdir}/scripts/mkcompile_h
-%exclude %{_kernelsrcdir}/scripts/mkmakefile
%exclude %{_kernelsrcdir}/scripts/mod
%exclude %{_kernelsrcdir}/scripts/setlocalversion
%exclude %{_kernelsrcdir}/scripts/subarch.include
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index c5917fda..7725c4da 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0
-aufs5.x-rcN kbuild patch
+aufs5.14 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index 141a856c50e71..6741d695b1df8 100644
+index a7749c126b8e2..12fd57d4aa57e 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -292,6 +292,7 @@ source "fs/sysv/Kconfig"
+@@ -307,6 +307,7 @@ source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/erofs/Kconfig"
source "fs/vboxsf/Kconfig"
@@ -14,22 +14,22 @@ index 141a856c50e71..6741d695b1df8 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index 9c708e1fbe8fb..fde6be84a0830 100644
+index f98f3e691c376..5e9aaa284700e 100644
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
+@@ -135,3 +135,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_EROFS_FS) += erofs/
obj-$(CONFIG_VBOXSF_FS) += vboxsf/
obj-$(CONFIG_ZONEFS_FS) += zonefs/
+obj-$(CONFIG_AUFS_FS) += aufs/
SPDX-License-Identifier: GPL-2.0
-aufs5.x-rcN base patch
+aufs5.14 base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index bd7aff0c120f2..7c4bc08596e0b 100644
+index d7b4f32875a94..6c23696108031 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3040,6 +3040,19 @@ F: include/uapi/linux/audit.h
+@@ -3089,6 +3089,19 @@ F: include/uapi/linux/audit.h
F: kernel/audit*
F: lib/*audit.c
@@ -50,10 +50,10 @@ index bd7aff0c120f2..7c4bc08596e0b 100644
M: Miguel Ojeda <ojeda at kernel.org>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index d58d68f3c7cd0..794a8a1341989 100644
+index f0cdff0c5fbf4..e65f941a4181a 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -762,6 +762,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -810,6 +810,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}
@@ -92,7 +92,7 @@ index cf871a81f4fdc..bc5095b734f58 100644
{
struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index dfc72f15be7fc..d8a12eb63961d 100644
+index f946bec8f1f1b..a44da05bcb9a6 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -33,7 +33,7 @@
@@ -127,7 +127,7 @@ index c93500d84264d..f24d21236ad01 100644
if (inode->i_op->update_time)
return inode->i_op->update_time(inode, time, flags);
diff --git a/fs/namespace.c b/fs/namespace.c
-index f63337828e1c4..099e89c81af7c 100644
+index 97adcb5ab5d55..4f543907c8200 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -807,6 +807,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -185,7 +185,7 @@ index 1373a610dc784..b7b5a0a0df6ff 100644
if (wait)
sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index c3c88fdb9b2a5..93eb43e002d97 100644
+index 640574294216c..ffeed3ccd2d62 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1335,6 +1335,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -204,7 +204,7 @@ index c3c88fdb9b2a5..93eb43e002d97 100644
int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
-@@ -2565,6 +2567,7 @@ extern int current_umask(void);
+@@ -2564,6 +2566,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode);
extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int);
@@ -212,7 +212,7 @@ index c3c88fdb9b2a5..93eb43e002d97 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
-@@ -2805,6 +2808,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2810,6 +2813,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
}
void emergency_thaw_all(void);
@@ -269,7 +269,7 @@ index a55179fd60fc3..8e21c53cf8831 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 48d736aa03b24..dce278159546c 100644
+index bf1c00c881e48..e0aaf34974df5 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -189,7 +189,7 @@ static
@@ -290,10 +290,10 @@ index 48d736aa03b24..dce278159546c 100644
#ifdef CONFIG_LOCK_STAT
static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
SPDX-License-Identifier: GPL-2.0
-aufs5.x-rcN mmap patch
+aufs5.14 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 3851bfcdba56e..d632ddd5f5ee8 100644
+index e5b5f7709d48f..4394d8c1bdad8 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2183,7 +2183,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
@@ -322,7 +322,7 @@ index 13452b32e2bd5..38acccfef9d49 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index fc9784544b241..84ba06f5158e9 100644
+index eb97468dfe4ca..570f1003a7dc6 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@@ -337,7 +337,7 @@ index fc9784544b241..84ba06f5158e9 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1864,7 +1867,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1866,7 +1869,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
@@ -363,10 +363,10 @@ index a6d21fc0033c6..02c2de31196e0 100644
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 322ec61d0da79..ae6f0584e4c98 100644
+index 7ca22e6e694a8..c7c40fd7f65a6 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1798,6 +1798,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1805,6 +1805,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
@@ -396,10 +396,10 @@ index 322ec61d0da79..ae6f0584e4c98 100644
void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 6613b26a88946..e94df45b5483a 100644
+index 52bbd2b7cb465..aeb888d448055 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -279,6 +279,7 @@ struct vm_region {
+@@ -286,6 +286,7 @@ struct vm_region {
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 */
@@ -407,7 +407,7 @@ index 6613b26a88946..e94df45b5483a 100644
int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -358,6 +359,7 @@ struct vm_area_struct {
+@@ -365,6 +366,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */
struct file * vm_file; /* File we map to (can be NULL). */
@@ -416,7 +416,7 @@ index 6613b26a88946..e94df45b5483a 100644
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
-index dc06afd725cbd..66f1486e63e35 100644
+index 44f4c2d83763f..dc1b528f962ce 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -559,7 +559,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -429,7 +429,7 @@ index dc06afd725cbd..66f1486e63e35 100644
put_write_access(inode);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
-index bf71e295e9f69..bd223b81c564c 100644
+index e3436741d5391..0d1dc7789d640 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
@@ -442,7 +442,7 @@ index bf71e295e9f69..bd223b81c564c 100644
# Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c
-index 66f7e9fdfbc4f..f9a8ff48e697a 100644
+index d1458ecf2f51e..6ab6b7d72466e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3240,7 +3240,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -455,7 +455,7 @@ index 66f7e9fdfbc4f..f9a8ff48e697a 100644
if (page->mapping != mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
-index 0584e540246e1..8b2f082002a9c 100644
+index ca54d36d203ae..43a69a77914f5 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -185,7 +185,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -476,7 +476,7 @@ index 0584e540246e1..8b2f082002a9c 100644
}
if (next->anon_vma)
anon_vma_merge(vma, next);
-@@ -1901,7 +1901,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1898,7 +1898,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
@@ -485,7 +485,7 @@ index 0584e540246e1..8b2f082002a9c 100644
vma->vm_file = NULL;
/* Undo any partial mapping done by a device driver. */
-@@ -2761,7 +2761,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2758,7 +2758,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
@@ -494,7 +494,7 @@ index 0584e540246e1..8b2f082002a9c 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
-@@ -2780,7 +2780,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2777,7 +2777,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new);
if (new->vm_file)
@@ -503,7 +503,7 @@ index 0584e540246e1..8b2f082002a9c 100644
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
-@@ -2973,7 +2973,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2972,7 +2972,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma;
unsigned long populate = 0;
unsigned long ret = -EINVAL;
@@ -512,7 +512,7 @@ index 0584e540246e1..8b2f082002a9c 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid);
-@@ -3032,10 +3032,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -3031,10 +3031,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
if (vma->vm_flags & VM_LOCKED)
flags |= MAP_LOCKED;
@@ -541,7 +541,7 @@ index 0584e540246e1..8b2f082002a9c 100644
out:
mmap_write_unlock(mm);
if (populate)
-@@ -3322,7 +3339,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3315,7 +3332,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma))
goto out_free_mempol;
if (new_vma->vm_file)
@@ -551,7 +551,7 @@ index 0584e540246e1..8b2f082002a9c 100644
new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c
-index 85a3a68dffb68..a2bee44172ccc 100644
+index 3a93d40548104..501a874fedcb0 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -523,7 +523,7 @@ static void __put_nommu_region(struct vm_region *region)
@@ -596,7 +596,7 @@ index 85a3a68dffb68..a2bee44172ccc 100644
diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644
-index 0000000000000..00d51187c3250
+index 0000000000000..511543ab1b418
--- /dev/null
+++ b/mm/prfile.c
@@ -0,0 +1,86 @@
@@ -608,7 +608,7 @@ index 0000000000000..00d51187c3250
+ *
+ * See Documentation/filesystems/aufs/design/06mmap.txt
+ *
-+ * Copyright (c) 2014-2020 Junjro R. Okajima
++ * Copyright (c) 2014-2021 Junjro R. Okajima
+ * Copyright (c) 2014 Ian Campbell
+ */
+
@@ -687,7 +687,7 @@ index 0000000000000..00d51187c3250
+}
+#endif /* !CONFIG_MMU */
SPDX-License-Identifier: GPL-2.0
-aufs5.x-rcN standalone patch
+aufs5.14 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
index bc5095b734f58..9508bd57a3bc0 100644
@@ -710,10 +710,10 @@ index bc5095b734f58..9508bd57a3bc0 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
-index 18594f11c31fe..ac38c0424d2a3 100644
+index 38f63451b9282..7710637ed0bc9 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -114,6 +114,7 @@ bool path_noexec(const struct path *path)
+@@ -111,6 +111,7 @@ bool path_noexec(const struct path *path)
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
}
@@ -722,7 +722,7 @@ index 18594f11c31fe..ac38c0424d2a3 100644
#ifdef CONFIG_USELIB
/*
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index d8a12eb63961d..0532996186311 100644
+index a44da05bcb9a6..a9cf3ad532923 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
@@ -766,7 +766,7 @@ index f24d21236ad01..78de5b5dc0840 100644
/**
* atime_needs_update - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
-index 099e89c81af7c..3e46b53795b1e 100644
+index 4f543907c8200..74d756a79cb72 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -438,6 +438,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -785,7 +785,7 @@ index 099e89c81af7c..3e46b53795b1e 100644
/*
* vfsmount lock must be held for write
-@@ -1987,6 +1989,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -2018,6 +2020,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
@@ -806,7 +806,7 @@ index fb89c351295d6..460ad19c2570a 100644
/*
* Drop a reference to a group. Free it if it's through.
diff --git a/fs/open.c b/fs/open.c
-index e53af13b5835f..f37da065e6544 100644
+index 94bef26ff1b61..33412587d76dd 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -65,6 +65,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,
@@ -882,7 +882,7 @@ index 5c8c5175b385c..ff7e9ff774b73 100644
ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index dce278159546c..5b0c571dbca2f 100644
+index e0aaf34974df5..d7b737731d4ef 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -210,6 +210,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -903,10 +903,10 @@ index 1698fbe6f0e13..081b05acadf82 100644
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c
-index b38155b2de83f..386c2741886ce 100644
+index 9ffa9e9c5c554..83b533a3fb8e8 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -1146,6 +1146,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -1147,6 +1147,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
}
@@ -914,7 +914,7 @@ index b38155b2de83f..386c2741886ce 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry)
{
-@@ -1162,6 +1163,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1163,6 +1164,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name);
}
@@ -922,7 +922,7 @@ index b38155b2de83f..386c2741886ce 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
-@@ -1170,6 +1172,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1171,6 +1173,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
}
@@ -930,7 +930,7 @@ index b38155b2de83f..386c2741886ce 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
-@@ -1197,6 +1200,7 @@ int security_path_truncate(const struct path *path)
+@@ -1198,6 +1201,7 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
@@ -938,7 +938,7 @@ index b38155b2de83f..386c2741886ce 100644
int security_path_chmod(const struct path *path, umode_t mode)
{
-@@ -1204,6 +1208,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1205,6 +1209,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
@@ -946,7 +946,7 @@ index b38155b2de83f..386c2741886ce 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
-@@ -1211,6 +1216,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1212,6 +1217,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
return 0;
return call_int_hook(path_chown, 0, path, uid, gid);
}
@@ -954,7 +954,7 @@ index b38155b2de83f..386c2741886ce 100644
int security_path_chroot(const struct path *path)
{
-@@ -1311,6 +1317,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -1312,6 +1318,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return call_int_hook(inode_permission, 0, inode, mask);
}
@@ -962,7 +962,7 @@ index b38155b2de83f..386c2741886ce 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
-@@ -1508,6 +1515,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -1509,6 +1516,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
@@ -972,7 +972,7 @@ index b38155b2de83f..386c2741886ce 100644
{
diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/debugfs-aufs 2021-06-30 21:35:11.393873211 +0200
++++ linux/Documentation/ABI/testing/debugfs-aufs 2021-05-02 20:15:14.666670785 +0200
@@ -0,0 +1,55 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@@ -1031,7 +1031,7 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Document
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs 2021-06-30 21:35:11.393873211 +0200
++++ linux/Documentation/ABI/testing/sysfs-aufs 2021-05-02 20:15:14.666670785 +0200
@@ -0,0 +1,31 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@@ -1066,10 +1066,10 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentat
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,171 @@
+
-+# Copyright (C) 2005-2020 Junjiro R. Okajima
++# Copyright (C) 2005-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1241,10 +1241,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt lin
+about it. But currently I have implemented it in kernel space.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,258 @@
+
-+# Copyright (C) 2005-2020 Junjiro R. Okajima
++# Copyright (C) 2005-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1503,10 +1503,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt li
+For this purpose, use "aumvdown" command in aufs-util.git.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt linux/Documentation/filesystems/aufs/design/03atomic_open.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,85 @@
+
-+# Copyright (C) 2015-2020 Junjiro R. Okajima
++# Copyright (C) 2015-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1592,10 +1592,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.t
+ be implemented in aufs, but not all I am afraid.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,113 @@
+
-+# Copyright (C) 2005-2020 Junjiro R. Okajima
++# Copyright (C) 2005-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1709,10 +1709,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt li
+ by over-mounting something (or another method).
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,74 @@
+
-+# Copyright (C) 2005-2020 Junjiro R. Okajima
++# Copyright (C) 2005-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1787,10 +1787,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt li
+ same named entry on the upper branch.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,64 @@
+
-+# Copyright (C) 2005-2020 Junjiro R. Okajima
++# Copyright (C) 2005-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1855,7 +1855,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.tx
+ copyup policy.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot linux/Documentation/filesystems/aufs/design/06dirren.dot
--- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,31 @@
+
+// to view this graph, run dot(1) command in GRAPHVIZ.
@@ -1890,10 +1890,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot li
+}
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt linux/Documentation/filesystems/aufs/design/06dirren.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,102 @@
+
-+# Copyright (C) 2017-2020 Junjiro R. Okajima
++# Copyright (C) 2017-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1996,10 +1996,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt li
+equivalen to udba=reval case.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linux/Documentation/filesystems/aufs/design/06fhsm.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,120 @@
+
-+# Copyright (C) 2011-2020 Junjiro R. Okajima
++# Copyright (C) 2011-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2120,10 +2120,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linu
+should restore the original file state after an error happens.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,72 @@
+
-+# Copyright (C) 2005-2020 Junjiro R. Okajima
++# Copyright (C) 2005-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2196,10 +2196,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linu
+I have to give up this "looks-smater" approach.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt linux/Documentation/filesystems/aufs/design/06xattr.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,96 @@
+
-+# Copyright (C) 2014-2020 Junjiro R. Okajima
++# Copyright (C) 2014-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2296,10 +2296,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt lin
+now, aufs implements the branch attributes to ignore the error.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,58 @@
+
-+# Copyright (C) 2005-2020 Junjiro R. Okajima
++# Copyright (C) 2005-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2358,10 +2358,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt li
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,52 @@
+
-+# Copyright (C) 2005-2020 Junjiro R. Okajima
++# Copyright (C) 2005-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2414,10 +2414,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linu
+initramfs will use it to replace the old one at the next boot.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2021-02-24 13:33:42.737680181 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,47 @@
+
-+# Copyright (C) 2010-2020 Junjiro R. Okajima
++# Copyright (C) 2010-2021 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2465,7 +2465,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt lin
+regular files only.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
--- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/README 2021-06-30 21:35:11.393873211 +0200
++++ linux/Documentation/filesystems/aufs/README 2021-08-24 09:59:43.048691434 +0200
@@ -0,0 +1,396 @@
+
+Aufs5 -- advanced multi layered unification filesystem version 5.x
@@ -2865,11 +2865,11 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta
+# End: ;
diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
--- /usr/share/empty/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/aufs.h 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -2931,11 +2931,11 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
+#endif /* __AUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
--- /usr/share/empty/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/branch.c 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,1427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4362,11 +4362,11 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
+}
diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
--- /usr/share/empty/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.h 2021-06-30 21:35:11.393873211 +0200
++++ linux/fs/aufs/branch.h 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,375 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4741,7 +4741,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
+#endif /* __AUFS_BRANCH_H__ */
diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
--- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/conf.mk 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/conf.mk 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -4785,11 +4785,11 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
+-include ${srctree}/${src}/conf_priv.mk
diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
--- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2021-06-30 21:35:11.393873211 +0200
++++ linux/fs/aufs/cpup.c 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,1457 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6246,11 +6246,11 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
+}
diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
--- /usr/share/empty/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/cpup.h 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,100 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6350,11 +6350,11 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
+#endif /* __AUFS_CPUP_H__ */
diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
--- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dbgaufs.c 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,526 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6880,11 +6880,11 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
+}
diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
--- /usr/share/empty/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.h 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dbgaufs.h 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6937,11 +6937,11 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
+#endif /* __DBGAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
--- /usr/share/empty/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.c 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dcsub.c 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7166,11 +7166,11 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
+}
diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
--- /usr/share/empty/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.h 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dcsub.h 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,137 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7307,11 +7307,11 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
+#endif /* __AUFS_DCSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
--- /usr/share/empty/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/debug.c 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,441 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7752,11 +7752,11 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
+}
diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
--- /usr/share/empty/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.h 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/debug.h 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7982,11 +7982,11 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
+#endif /* __AUFS_DEBUG_H__ */
diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
--- /usr/share/empty/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c 2021-06-30 21:35:11.393873211 +0200
++++ linux/fs/aufs/dentry.c 2021-09-06 21:02:45.273492232 +0200
@@ -0,0 +1,1160 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -9146,11 +9146,11 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
+};
diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
--- /usr/share/empty/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h 2021-06-30 21:35:11.393873211 +0200
++++ linux/fs/aufs/dentry.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,269 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -9419,11 +9419,11 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
+#endif /* __AUFS_DENTRY_H__ */
diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
--- /usr/share/empty/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dinfo.c 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dinfo.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,554 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -9977,11 +9977,11 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
--- /usr/share/empty/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c 2021-06-30 21:35:11.393873211 +0200
++++ linux/fs/aufs/dir.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,765 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10746,11 +10746,11 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
+};
diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
--- /usr/share/empty/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.h 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dir.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,134 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10884,11 +10884,11 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
+#endif /* __AUFS_DIR_H__ */
diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
--- /usr/share/empty/fs/aufs/dirren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.c 2021-06-30 21:35:11.393873211 +0200
++++ linux/fs/aufs/dirren.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,1316 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2017-2020 Junjiro R. Okajima
++ * Copyright (C) 2017-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12204,11 +12204,11 @@ diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
+}
diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
--- /usr/share/empty/fs/aufs/dirren.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.h 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/dirren.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2017-2020 Junjiro R. Okajima
++ * Copyright (C) 2017-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12348,11 +12348,11 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
+#endif /* __AUFS_DIRREN_H__ */
diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
--- /usr/share/empty/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/dynop.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,368 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2010-2020 Junjiro R. Okajima
++ * Copyright (C) 2010-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12720,11 +12720,11 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
+}
diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
--- /usr/share/empty/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.h 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/dynop.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2010-2020 Junjiro R. Okajima
++ * Copyright (C) 2010-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12801,11 +12801,11 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
+#endif /* __AUFS_DYNOP_H__ */
diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
--- /usr/share/empty/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/export.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,837 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -13642,11 +13642,11 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
+}
diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
--- /usr/share/empty/fs/aufs/fhsm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fhsm.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/fhsm.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2011-2020 Junjiro R. Okajima
++ * Copyright (C) 2011-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -14073,11 +14073,11 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
+}
diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
--- /usr/share/empty/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/file.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,863 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -14940,11 +14940,11 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
+};
diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
--- /usr/share/empty/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.h 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/file.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,342 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -15286,11 +15286,11 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
+#endif /* __AUFS_FILE_H__ */
diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
--- /usr/share/empty/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/finfo.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/finfo.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -15439,11 +15439,11 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
+}
diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
--- /usr/share/empty/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c 2021-06-30 21:35:11.393873211 +0200
++++ linux/fs/aufs/f_op.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,771 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16214,11 +16214,11 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
+};
diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
--- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/fstype.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,401 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16619,11 +16619,11 @@ diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
+#endif /* __AUFS_FSTYPE_H__ */
diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h
--- /usr/share/empty/fs/aufs/hbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hbl.h 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/hbl.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2017-2020 Junjiro R. Okajima
++ * Copyright (C) 2017-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16688,11 +16688,11 @@ diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h
+#endif /* __AUFS_HBL_H__ */
diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
--- /usr/share/empty/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsnotify.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/hfsnotify.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,288 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16980,11 +16980,11 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
+};
diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
--- /usr/share/empty/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsplus.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/hfsplus.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2010-2020 Junjiro R. Okajima
++ * Copyright (C) 2010-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -17044,11 +17044,11 @@ diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
+}
diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
--- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/hnotify.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,715 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -17763,11 +17763,11 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
+}
diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
--- /usr/share/empty/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/iinfo.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/iinfo.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,286 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -18053,11 +18053,11 @@ diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
--- /usr/share/empty/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/inode.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,531 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -18588,11 +18588,11 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/inode.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,705 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -19297,11 +19297,11 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
+#endif /* __AUFS_INODE_H__ */
diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
--- /usr/share/empty/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c 2021-02-24 13:33:42.744347058 +0100
++++ linux/fs/aufs/ioctl.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,220 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -19521,11 +19521,11 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
+#endif
diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
--- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/i_op_add.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,941 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -20466,11 +20466,11 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/i_op.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,1513 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -21983,11 +21983,11 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
+};
diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
--- /usr/share/empty/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_del.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/i_op_del.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,515 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22502,11 +22502,11 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
--- /usr/share/empty/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/i_op_ren.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,1251 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -23757,7 +23757,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
+}
diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
--- /usr/share/empty/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Kconfig 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/Kconfig 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,199 @@
+# SPDX-License-Identifier: GPL-2.0
+config AUFS_FS
@@ -23960,11 +23960,11 @@ diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
+endif
diff -urN /usr/share/empty/fs/aufs/lcnt.h linux/fs/aufs/lcnt.h
--- /usr/share/empty/fs/aufs/lcnt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/lcnt.h 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/lcnt.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,186 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2018-2020 Junjiro R. Okajima
++ * Copyright (C) 2018-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24150,11 +24150,11 @@ diff -urN /usr/share/empty/fs/aufs/lcnt.h linux/fs/aufs/lcnt.h
+#endif /* __AUFS_LCNT_H__ */
diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
--- /usr/share/empty/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/loop.c 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24302,11 +24302,11 @@ diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
+}
diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
--- /usr/share/empty/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.h 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/loop.h 2021-09-06 21:02:45.276825587 +0200
@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24361,7 +24361,7 @@ diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
+#endif /* __AUFS_LOOP_H__ */
diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
--- /usr/share/empty/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/magic.mk 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/magic.mk 2021-05-02 20:15:14.673337458 +0200
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -24396,7 +24396,7 @@ diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
+endif
diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
--- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile 2021-02-24 13:33:42.741013619 +0100
++++ linux/fs/aufs/Makefile 2021-05-02 20:15:14.670004120 +0200
@@ -0,0 +1,46 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -24446,11 +24446,11 @@ diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
--- /usr/share/empty/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/module.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24723,11 +24723,11 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
+module_exit(aufs_exit);
diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
--- /usr/share/empty/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/module.h 2021-09-06 21:06:28.017703615 +0200
@@ -0,0 +1,166 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24824,7 +24824,7 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
+static inline int au_kmidx_sub(size_t sz, size_t new_sz)
+{
+#ifndef CONFIG_SLOB
-+ return kmalloc_index(sz) - kmalloc_index(new_sz);
++ return __kmalloc_index(sz, false) - __kmalloc_index(new_sz, false);
+#else
+ return -1; /* SLOB is untested */
+#endif
@@ -24893,11 +24893,11 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
+#endif /* __AUFS_MODULE_H__ */
diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
--- /usr/share/empty/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/mvdown.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,706 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2011-2020 Junjiro R. Okajima
++ * Copyright (C) 2011-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -25603,11 +25603,11 @@ diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
--- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/opts.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,1880 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -27487,11 +27487,11 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
--- /usr/share/empty/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/opts.h 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,225 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -27716,11 +27716,11 @@ diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
+#endif /* __AUFS_OPTS_H__ */
diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
--- /usr/share/empty/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/plink.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/plink.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,516 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28236,11 +28236,11 @@ diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
+}
diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
--- /usr/share/empty/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/poll.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/poll.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28291,11 +28291,11 @@ diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
+}
diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
--- /usr/share/empty/fs/aufs/posix_acl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/posix_acl.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/posix_acl.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2014-2020 Junjiro R. Okajima
++ * Copyright (C) 2014-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28401,11 +28401,11 @@ diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
+}
diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
--- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/procfs.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2010-2020 Junjiro R. Okajima
++ * Copyright (C) 2010-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28575,11 +28575,11 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
+}
diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
--- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/rdu.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,384 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28963,11 +28963,11 @@ diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
+#endif
diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
--- /usr/share/empty/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/rwsem.h 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -29052,11 +29052,11 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
+#endif /* __AUFS_RWSEM_H__ */
diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
--- /usr/share/empty/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sbinfo.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sbinfo.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,314 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -29370,11 +29370,11 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
--- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/super.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,1050 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -30424,11 +30424,11 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/super.h 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,587 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31015,11 +31015,11 @@ diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
+#endif /* __AUFS_SUPER_H__ */
diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
--- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sysaufs.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31112,11 +31112,11 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
+}
diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
--- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.h 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sysaufs.h 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31218,11 +31218,11 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
+#endif /* __SYSAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
--- /usr/share/empty/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysfs.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sysfs.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,374 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31596,11 +31596,11 @@ diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
+}
diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
--- /usr/share/empty/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysrq.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/sysrq.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31749,11 +31749,11 @@ diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
+}
diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
--- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/vdir.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,896 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -32649,11 +32649,11 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/vfsub.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,916 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -33569,11 +33569,11 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/vfsub.h 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,358 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -33931,11 +33931,11 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2021-02-24 13:33:42.747680497 +0100
++++ linux/fs/aufs/wbr_policy.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -34765,11 +34765,11 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
+};
diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/whout.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,1070 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -35839,11 +35839,11 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
+}
diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
--- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/whout.h 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,87 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -35930,11 +35930,11 @@ diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
+#endif /* __AUFS_WHOUT_H__ */
diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
--- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c 2021-02-24 13:33:42.751013936 +0100
++++ linux/fs/aufs/wkq.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,372 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -36306,11 +36306,11 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
+}
diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
--- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h 2021-02-24 13:33:42.751013936 +0100
++++ linux/fs/aufs/wkq.h 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -36399,11 +36399,11 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
+#endif /* __AUFS_WKQ_H__ */
diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
--- /usr/share/empty/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/xattr.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,368 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2014-2020 Junjiro R. Okajima
++ * Copyright (C) 2014-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -36771,11 +36771,11 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
+}
diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
--- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c 2021-06-30 21:35:11.397206648 +0200
++++ linux/fs/aufs/xino.c 2021-09-06 21:02:45.280158943 +0200
@@ -0,0 +1,1925 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -38700,11 +38700,11 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
+}
diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h 2021-06-30 21:35:11.397206648 +0200
++++ linux/include/uapi/linux/aufs_type.h 2021-09-06 21:06:28.017703615 +0200
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
-+ * Copyright (C) 2005-2020 Junjiro R. Okajima
++ * Copyright (C) 2005-2021 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -38744,7 +38744,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+#include <limits.h>
+#endif /* __KERNEL__ */
+
-+#define AUFS_VERSION "5.x-rcN-20210517"
++#define AUFS_VERSION "5.14-20210906"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39155,13 +39155,13 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+
+#endif /* __AUFS_TYPE_H__ */
SPDX-License-Identifier: GPL-2.0
-aufs5.x-rcN loopback patch
+aufs5.14 loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 794a8a1341989..0e5664a6753e5 100644
+index e65f941a4181a..ce11efab143b7 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -647,6 +647,15 @@ static inline void loop_update_dio(struct loop_device *lo)
+@@ -685,6 +685,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio);
}
@@ -39174,28 +39174,28 @@ index 794a8a1341989..0e5664a6753e5 100644
+ return f;
+}
+
- static void loop_reread_partitions(struct loop_device *lo,
- struct block_device *bdev)
+ static void loop_reread_partitions(struct loop_device *lo)
{
-@@ -702,6 +711,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- unsigned int arg)
+ int rc;
+@@ -742,6 +751,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
{
- struct file *file = NULL, *old_file;
-+ struct file *f, *virt_file = NULL, *old_virt_file;
- int error;
- bool partscan;
-
-@@ -721,12 +731,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- file = fget(arg);
- if (!file)
+ struct file *file = fget(arg);
+ struct file *old_file;
++ struct file *f, *virt_file = NULL, *old_virt_file;
+ int error;
+ bool partscan;
+ bool is_loop;
+@@ -761,11 +771,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+ if (!(lo->lo_flags & LO_FLAGS_READ_ONLY))
goto out_err;
+
+ f = loop_real_file(file);
+ if (f) {
+ virt_file = file;
+ file = f;
+ get_file(file);
+ }
-
++
error = loop_validate_file(file, bdev);
if (error)
goto out_err;
@@ -39205,7 +39205,7 @@ index 794a8a1341989..0e5664a6753e5 100644
error = -EINVAL;
-@@ -738,6 +755,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -777,6 +795,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
blk_mq_freeze_queue(lo->lo_queue);
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
lo->lo_backing_file = file;
@@ -39213,47 +39213,47 @@ index 794a8a1341989..0e5664a6753e5 100644
lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
mapping_set_gfp_mask(file->f_mapping,
lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
-@@ -751,6 +769,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -799,6 +818,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
+ if (old_virt_file)
+ fput(old_virt_file);
if (partscan)
- loop_reread_partitions(lo, bdev);
+ loop_reread_partitions(lo);
return 0;
-@@ -759,6 +779,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
- mutex_unlock(&lo->lo_mutex);
- if (file)
- fput(file);
+@@ -807,6 +828,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+ loop_global_unlock(lo, is_loop);
+ out_putf:
+ fput(file);
+ if (virt_file)
+ fput(virt_file);
return error;
}
-@@ -1085,7 +1107,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
- struct block_device *bdev,
+@@ -1207,6 +1230,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
const struct loop_config *config)
{
-- struct file *file;
-+ struct file *file, *f, *virt_file = NULL;
- struct inode *inode;
+ struct file *file = fget(config->fd);
++ struct file *f, *virt_file = NULL;
+ struct inode *inode;
struct address_space *mapping;
- int error;
-@@ -1100,6 +1122,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
- file = fget(config->fd);
- if (!file)
- goto out;
+ int error;
+@@ -1222,6 +1246,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+ /* This is safe, since we have a reference from open(). */
+ __module_get(THIS_MODULE);
+
+ f = loop_real_file(file);
+ if (f) {
+ virt_file = file;
+ file = f;
+ get_file(file);
+ }
-
++
/*
* If we don't hold exclusive handle for the device, upgrade to it
-@@ -1154,6 +1182,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+ * here to avoid changing device under exclusive owner.
+@@ -1286,6 +1317,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
lo->lo_device = bdev;
lo->lo_backing_file = file;
@@ -39261,16 +39261,16 @@ index 794a8a1341989..0e5664a6753e5 100644
lo->old_gfp_mask = mapping_gfp_mask(mapping);
mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
-@@ -1204,6 +1233,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1340,6 +1372,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
bd_abort_claiming(bdev, loop_configure);
out_putf:
fput(file);
+ if (virt_file)
+ fput(virt_file);
- out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
-@@ -1213,6 +1244,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+ return error;
+@@ -1348,6 +1382,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
static int __loop_clr_fd(struct loop_device *lo, bool release)
{
struct file *filp = NULL;
@@ -39278,7 +39278,7 @@ index 794a8a1341989..0e5664a6753e5 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
-@@ -1239,6 +1271,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1399,6 +1434,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock);
lo->lo_backing_file = NULL;
@@ -39286,7 +39286,7 @@ index 794a8a1341989..0e5664a6753e5 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
-@@ -1320,6 +1353,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1479,6 +1515,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
@@ -39296,7 +39296,7 @@ index 794a8a1341989..0e5664a6753e5 100644
}
diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index a3c04f310672e..161c3c5d1c22b 100644
+index 1988899db63ac..ff866d85aceac 100644
--- a/drivers/block/loop.h
+++ b/drivers/block/loop.h
@@ -46,7 +46,7 @@ struct loop_device {
@@ -39309,7 +39309,7 @@ index a3c04f310672e..161c3c5d1c22b 100644
void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 9f58ba0cb769f..1c2267a5a2ae1 100644
+index 99ceca1440449..e49dfe8550329 100644
--- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c
@@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
@@ -39322,7 +39322,7 @@ index 9f58ba0cb769f..1c2267a5a2ae1 100644
if (file->f_mapping != h_file->f_mapping) {
file->f_mapping = h_file->f_mapping;
diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
-index a8b63acc62045..9d97c3af5686a 100644
+index 74347bd75b380..5ef888a1d53f4 100644
--- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c
@@ -133,3 +133,19 @@ void au_loopback_fin(void)
@@ -39346,7 +39346,7 @@ index a8b63acc62045..9d97c3af5686a 100644
+ return f;
+}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index 94f4f80ae33bf..ca1194354aff4 100644
+index 7293bee427f96..3345c098d0d47 100644
--- a/fs/aufs/loop.h
+++ b/fs/aufs/loop.h
@@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
@@ -39368,7 +39368,7 @@ index 94f4f80ae33bf..ca1194354aff4 100644
#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index d252963a87b53..ecfc5fc96ad8c 100644
+index ae38857541533..af32f0960e595 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
@@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {
@@ -39384,10 +39384,10 @@ index d252963a87b53..ecfc5fc96ad8c 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 93eb43e002d97..8b392f6b36a62 100644
+index ffeed3ccd2d62..6a8e599051b77 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -2178,6 +2178,10 @@ struct super_operations {
+@@ -2177,6 +2177,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index fe01ad4b..5044c320 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -76,9 +76,11 @@ BLK_DEV_THROTTLING all=y
BLK_DEV_THROTTLING_LOW all=y
BLK_CMDLINE_PARSER all=y
BLK_WBT all=y
+BLK_WBT_MQ all=y
BLK_CGROUP_IOLATENCY all=y
+BLK_CGROUP_FC_APPID=y
BLK_CGROUP_IOCOST all=y
-BLK_WBT_MQ all=y
+BLK_CGROUP_IOPRIO=y
BLK_DEBUG_FS all=y
BLK_SED_OPAL all=y
BLK_INLINE_ENCRYPTION all=y
@@ -368,6 +370,7 @@ ACPI_CONFIGFS all=m
#- file drivers/acpi/arm64/Kconfig goes here
#- file drivers/acpi/pmic/Kconfig goes here
X86_PM_TIMER x86=y
+ACPI_PRMT=y
#-
#- *** FILE: drivers/acpi/apei/Kconfig ***
@@ -405,6 +408,7 @@ PMIC_OPREGION all=y
XPOWER_PMIC_OPREGION all=y
BXT_WC_PMIC_OPREGION all=y
CHT_DC_TI_PMIC_OPREGION all=y
+TPS68470_PMIC_OPREGION=y
#-
#- *** FILE: drivers/android/Kconfig ***
@@ -776,7 +780,6 @@ IBM_BSR ppc64=m
#- file drivers/char/ipmi/Kconfig goes here
#- file drivers/char/hw_random/Kconfig goes here
DTLK all=m
-R3964 all=m
APPLICOM all=m
SONYPI i386=m
#- file drivers/char/pcmcia/Kconfig goes here
@@ -786,8 +789,6 @@ PC8736x_GPIO i386=m x86_64=m
NSC_GPIO i386=m x86_64=m
DEVMEM all=y
NVRAM all=m
-RAW_DRIVER all=m
-MAX_RAW_DEVS all=1024
DEVPORT all=y
HPET all=y
HPET_MMAP all=y
@@ -891,12 +892,14 @@ TCG_TIS_ST33ZP24_SPI all=m
#-
XILLYBUS all=m
XILLYBUS_PCIE all=m
+XILLYUSB=m
#-
#- *** FILE: drivers/clk/Kconfig ***
#-
COMMON_CLK_WM831X all=m
#- file drivers/clk/versatile/Kconfig goes here
+LMK04832=m
COMMON_CLK_MAX9485 all=m
COMMON_CLK_SCPI all=m
COMMON_CLK_SI5341 all=m
@@ -953,6 +956,12 @@ COMMON_CLK_MT2701_BDPSYS all=y
SUNXI_CCU all=y
SUN8I_H3_CCU all=y
+#-
+#- *** FILE: drivers/clk/versatile/Kconfig ***
+#-
+ICST=y
+CLK_SP810=y
+
#-
#- *** FILE: drivers/clk/xilinx/Kconfig ***
#-
@@ -1108,6 +1117,7 @@ PROC_EVENTS all=y
COUNTER all=m
104_QUAD_8 all=m
INTERRUPT_CNT all=m
+INTEL_QEP=m
#-
#- *** FILE: drivers/cpufreq/Kconfig ***
@@ -1230,6 +1240,8 @@ CRYPTO_DEV_VIRTIO all=m
CXL_BUS all=m
CXL_MEM all=m
CXL_MEM_RAW_COMMANDS all=y
+CXL_ACPI=m
+CXL_PMEM=m
#-
#- *** FILE: drivers/dax/Kconfig ***
@@ -1432,6 +1444,7 @@ ISCSI_IBFT_FIND all=y
ISCSI_IBFT all=m
FW_CFG_SYSFS all=m
FW_CFG_SYSFS_CMDLINE all=y
+#- file drivers/firmware/arm_ffa/Kconfig goes here
#- file drivers/firmware/broadcom/Kconfig goes here
#- file drivers/firmware/google/Kconfig goes here
#- file drivers/firmware/efi/Kconfig goes here
@@ -1568,6 +1581,7 @@ GPIO_TIMBERDALE all=y
GPIO_TPS65086 all=m
GPIO_TPS65218 all=m
GPIO_TPS65912 all=m
+GPIO_TPS68470=y
GPIO_TQMX86 all=m
GPIO_TWL4030 powerpc=m
GPIO_UCB1400 all=m
@@ -1658,6 +1672,7 @@ DRM_VKMS all=m
#- file drivers/gpu/drm/tidss/Kconfig goes here
#- file drivers/gpu/drm/xlnx/Kconfig goes here
#- file drivers/gpu/drm/gud/Kconfig goes here
+DRM_HYPERV=m
DRM_LEGACY all=y
DRM_TDFX all=m
DRM_R128 all=m
@@ -1686,6 +1701,7 @@ DRM_AMDGPU_USERPTR all=y
#- *** FILE: drivers/gpu/drm/amd/amdkfd/Kconfig ***
#-
HSA_AMD all=y
+HSA_AMD_SVM=y
#-
#- *** FILE: drivers/gpu/drm/amd/display/Kconfig ***
@@ -1796,6 +1812,7 @@ DRM_RADEON_USERPTR all=y
#-
DRM_CIRRUS_QEMU all=m
DRM_GM12U320 all=m
+DRM_SIMPLEDRM=m
TINYDRM_HX8357D all=m
TINYDRM_ILI9225 all=m
TINYDRM_ILI9341 all=m
@@ -2155,6 +2172,7 @@ SENSORS_SBTSI all=m
SENSORS_SHT15 all=m
SENSORS_SHT21 all=m
SENSORS_SHT3x all=m
+SENSORS_SHT4x=m
SENSORS_SHTC1 all=m
SENSORS_SIS5595 all=m
SENSORS_DME1737 all=m
@@ -2223,6 +2241,7 @@ SENSORS_BEL_PFE all=m
SENSORS_BPA_RS600 all=m
SENSORS_FSP_3Y all=m
SENSORS_IBM_CFFPS all=m
+SENSORS_DPS920AB=m
SENSORS_INSPUR_IPSPS all=m
SENSORS_IR35221 all=m
SENSORS_IR36021 all=m
@@ -2241,7 +2260,9 @@ SENSORS_MAX20751 all=m
SENSORS_MAX31785 all=m
SENSORS_MAX34440 all=m
SENSORS_MAX8688 all=m
+SENSORS_MP2888=m
SENSORS_MP2975 all=m
+SENSORS_PIM4328=m
SENSORS_PM6764TR all=m
SENSORS_PXE1610 all=m
SENSORS_Q54SJ108A2 all=m
@@ -2396,78 +2417,6 @@ DW_I3C_MASTER all=m
SVC_I3C_MASTER all=m
MIPI_I3C_HCI all=m
-#-
-#- *** FILE: drivers/ide/Kconfig ***
-#-
-#* on PowerPC IDE must be 'y' to be able to select BLK_DEV_IDE_PMAC
-IDE all=m ppc=y ppc64=y sparc=n
-#- Please see Documentation/ide/ide.rst for help/info on IDE drives
-BLK_DEV_IDE_SATA all=n
-IDE_GD all=m
-IDE_GD_ATA all=y
-IDE_GD_ATAPI all=y
-BLK_DEV_IDECS all=m
-BLK_DEV_DELKIN all=m
-BLK_DEV_IDECD all=m
-BLK_DEV_IDETAPE all=m
-BLK_DEV_IDEACPI all=y
-IDE_TASK_IOCTL all=y
-IDE_PROC_FS all=y
-#- IDE chipset support/bugfixes
-IDE_GENERIC all=m
-BLK_DEV_PLATFORM all=n
-BLK_DEV_CMD640 i386=m x86_64=n
-BLK_DEV_CMD640_ENHANCED i386=y
-BLK_DEV_IDEPNP all=m
-#- PCI IDE chipsets support
-BLK_DEV_IDEPCI all=y
-IDEPCI_PCIBUS_ORDER all=n
-BLK_DEV_OFFBOARD all=n ppc=y ppc64=y
-BLK_DEV_GENERIC all=m
-BLK_DEV_OPTI621 all=m
-BLK_DEV_RZ1000 i386=m x86_64=n
-BLK_DEV_IDEDMA_PCI all=y
-BLK_DEV_AEC62XX all=m
-BLK_DEV_ALI15X3 all=m
-BLK_DEV_AMD74XX all=m ppc=n ppc64=n
-BLK_DEV_ATIIXP i386=m x86_64=m
-BLK_DEV_CMD64X all=m
-BLK_DEV_TRIFLEX all=m
-BLK_DEV_CY82C693 all=m
-BLK_DEV_CS5520 all=m
-BLK_DEV_CS5530 all=m
-BLK_DEV_CS5535 i386=m
-BLK_DEV_CS5536 i386=m
-BLK_DEV_HPT366 all=m
-BLK_DEV_JMICRON all=m sparc64=n
-BLK_DEV_SC1200 all=m
-BLK_DEV_PIIX all=m
-BLK_DEV_IT8172 all=m
-BLK_DEV_IT8213 all=m
-BLK_DEV_IT821X all=m
-BLK_DEV_NS87415 all=m
-BLK_DEV_PDC202XX_OLD all=m
-BLK_DEV_PDC202XX_NEW all=m
-BLK_DEV_SVWKS all=m
-BLK_DEV_SIIMAGE all=m
-BLK_DEV_SIS5513 i386=m x86_64=m
-BLK_DEV_SL82C105 arm=m ppc=m ppc64=m
-BLK_DEV_SLC90E66 all=m
-BLK_DEV_TRM290 all=m
-BLK_DEV_VIA82CXXX all=m
-BLK_DEV_TC86C001 all=m
-#* BLK_DEV_IDE_PMAC could be 'm' but it fails to build with PMAC_MEDIABAY=y
-BLK_DEV_IDE_PMAC ppc=y ppc64=y
-BLK_DEV_IDE_PMAC_ATA100FIRST ppc=y ppc64=y
-#- Other IDE chipsets support
-#- Note: most of these also require special kernel boot parameters
-BLK_DEV_4DRIVES alpha=m i386=m
-BLK_DEV_ALI14XX alpha=m i386=m
-BLK_DEV_DTC2278 alpha=m i386=m
-BLK_DEV_HT6560B alpha=m i386=m
-BLK_DEV_QD65XX alpha=m i386=m
-BLK_DEV_UMC8672 alpha=m i386=m
-
#-
#- *** FILE: drivers/idle/Kconfig ***
#-
@@ -2527,6 +2476,8 @@ DA280 all=m
DA311 all=m
DMARD09 all=m
DMARD10 all=m
+FXLS8962AF_I2C=m
+FXLS8962AF_SPI=m
HID_SENSOR_ACCEL_3D all=m
IIO_CROS_EC_ACCEL_LEGACY all=m
IIO_ST_ACCEL_3AXIS all=m
@@ -2544,6 +2495,7 @@ MMA9553 all=m
MXC4005 all=m
MXC6255 all=m
SCA3000 all=m
+SCA3300=m
STK8312 all=m
STK8BA50 all=m
@@ -2614,6 +2566,7 @@ TI_ADS7950 all=m
TI_ADS131E08 all=m
TI_AM335X_ADC all=m
TI_TLC4541 all=m
+TI_TSC2046=m
VIPERBOARD_ADC all=m
XILINX_XADC all=m
@@ -2651,6 +2604,8 @@ SCD30_I2C all=m
SCD30_SERIAL all=m
SENSIRION_SGP30 all=m
SPS30 all=m
+SPS30_I2C=m
+SPS30_SERIAL=m
VZ89X all=m
#-
@@ -2769,6 +2724,7 @@ KMX61 all=m
#- file drivers/iio/imu/inv_icm42600/Kconfig goes here
#- file drivers/iio/imu/inv_mpu6050/Kconfig goes here
#- file drivers/iio/imu/st_lsm6dsx/Kconfig goes here
+#- file drivers/iio/imu/st_lsm9ds0/Kconfig goes here
#-
#- *** FILE: drivers/iio/imu/bmi160/Kconfig ***
@@ -2796,6 +2752,11 @@ IIO_ST_LSM6DSX all=m
IIO_ST_LSM6DSX_I2C all=m
IIO_ST_LSM6DSX_SPI all=m
+#-
+#- *** FILE: drivers/iio/imu/st_lsm9ds0/Kconfig ***
+#-
+IIO_ST_LSM9DS0=m
+
#-
#- *** FILE: drivers/iio/light/Kconfig ***
#-
@@ -2840,6 +2801,7 @@ TCS3414 all=m
TCS3472 all=m
SENSORS_TSL2563 all=m
TSL2583 all=m
+TSL2591=m
TSL2772 all=m
TSL4531 all=m
US5182D all=m
@@ -2958,6 +2920,7 @@ MLX90614 all=m
MLX90632 all=m
TMP006 all=m
TMP007 all=m
+TMP117=m
TSYS01 all=m
TSYS02D all=m
MAX31856 all=m
@@ -2983,7 +2946,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
#- file drivers/infiniband/hw/qib/Kconfig goes here
#- file drivers/infiniband/hw/cxgb4/Kconfig goes here
#- file drivers/infiniband/hw/efa/Kconfig goes here
-#- file drivers/infiniband/hw/i40iw/Kconfig goes here
+#- file drivers/infiniband/hw/irdma/Kconfig goes here
#- file drivers/infiniband/hw/mlx4/Kconfig goes here
#- file drivers/infiniband/hw/mlx5/Kconfig goes here
#- file drivers/infiniband/hw/ocrdma/Kconfig goes here
@@ -3027,9 +2990,9 @@ HFI1_DEBUG_SDMA_ORDER all=n
SDMA_VERBOSITY all=n
#-
-#- *** FILE: drivers/infiniband/hw/i40iw/Kconfig ***
+#- *** FILE: drivers/infiniband/hw/irdma/Kconfig ***
#-
-INFINIBAND_I40IW all=m
+INFINIBAND_IRDMA=m
#-
#- *** FILE: drivers/infiniband/hw/mlx4/Kconfig ***
@@ -3198,6 +3161,7 @@ JOYSTICK_WALKERA0701 all=m
JOYSTICK_PSXPAD_SPI all=m
JOYSTICK_PSXPAD_SPI_FF all=y
JOYSTICK_PXRC all=m
+JOYSTICK_QWIIC=m
JOYSTICK_FSIA6B all=m
#-
@@ -3512,6 +3476,7 @@ IOMMU_DEFAULT_PASSTHROUGH all=y
#- file drivers/iommu/intel/Kconfig goes here
IRQ_REMAP all=y
HYPERV_IOMMU all=y
+VIRTIO_IOMMU=m
#-
#- *** FILE: drivers/iommu/amd/Kconfig ***
@@ -3919,7 +3884,6 @@ DVB_VES1X93 all=m
DVB_TDA826X all=m
DVB_TUA6100 all=m
#- DVB-T (terrestrial) frontends
-DVB_SP8870 all=m
DVB_SP887X all=m
DVB_CX22700 all=m
DVB_CX22702 all=m
@@ -4007,6 +3971,7 @@ VIDEO_ADV7175 all=m
VIDEO_UPD64031A all=m
VIDEO_UPD64083 all=m
VIDEO_HI556 all=m
+VIDEO_IMX208=m
VIDEO_IMX214 all=m
VIDEO_IMX219 all=m
VIDEO_IMX258 all=m
@@ -4210,7 +4175,6 @@ CIO2_BRIDGE all=y
#- *** FILE: drivers/media/pci/ivtv/Kconfig ***
#-
VIDEO_IVTV all=m sparc=n
-VIDEO_IVTV_DEPRECATED_IOCTLS all=n
VIDEO_IVTV_ALSA all=m
VIDEO_FB_IVTV all=m sparc=n
VIDEO_FB_IVTV_FORCE_PAT all=y
@@ -4291,13 +4255,10 @@ STA2X11_VIP all=m
#-
#- *** FILE: drivers/media/pci/ttpci/Kconfig ***
#-
-DVB_AV7110 all=m sparc=n
-DVB_AV7110_OSD all=y
DVB_BUDGET_CORE all=m
DVB_BUDGET all=m sparc=n
DVB_BUDGET_CI all=m sparc=n
DVB_BUDGET_AV all=m sparc=n
-DVB_BUDGET_PATCH all=m
#-
#- *** FILE: drivers/media/pci/tw5864/Kconfig ***
@@ -4903,6 +4864,7 @@ PCF50633_ADC all=m
PCF50633_GPIO all=m
UCB1400_CORE all=m
MFD_RDC321X all=m
+MFD_RT4831=m
MFD_RT5033 all=m
MFD_RN5T618 all=m
MFD_SI476X_CORE all=m
@@ -5228,6 +5190,7 @@ MTD_DATAFLASH all=m ppc=n ppc64=n sparc=n
MTD_DATAFLASH_WRITE_VERIFY all=y
MTD_DATAFLASH_OTP all=y
MTD_MCHP23K256 all=m
+MTD_MCHP48L640=m
MTD_SST25L all=m
MTD_SLRAM all=m
MTD_PHRAM all=m
@@ -5473,7 +5436,6 @@ ARCNET_COM20020_CS all=m
#-
CAIF_DRIVERS all=y
CAIF_TTY all=m
-CAIF_HSI all=m
CAIF_VIRTIO all=m
#-
@@ -6147,8 +6109,6 @@ MLXSW_CORE_HWMON all=y
MLXSW_CORE_THERMAL all=y
MLXSW_PCI all=m
MLXSW_I2C all=m
-MLXSW_SWITCHIB all=m
-MLXSW_SWITCHX2 all=m
MLXSW_SPECTRUM all=m
MLXSW_SPECTRUM_DCB all=y
MLXSW_MINIMAL all=m
@@ -6170,6 +6130,7 @@ ENC28J60 all=m
ENC28J60_WRITEVERIFY all=n
ENCX24J600 all=m
LAN743X all=m
+#- file drivers/net/ethernet/microchip/sparx5/Kconfig goes here
#-
#- *** FILE: drivers/net/ethernet/microsoft/Kconfig ***
@@ -6381,6 +6342,7 @@ STMMAC_ETH all=m
STMMAC_SELFTESTS all=n
STMMAC_PLATFORM all=n
DWMAC_INTEL all=m
+DWMAC_LOONGSON=m
STMMAC_PCI all=n
#-
@@ -6552,10 +6514,12 @@ LSI_ET1011C_PHY all=m
MARVELL_PHY all=m
MARVELL_10G_PHY all=m
MARVELL_88X2222_PHY all=m
+MEDIATEK_GE_PHY=m
MICREL_PHY all=m
MICROCHIP_PHY all=m
MICROCHIP_T1_PHY all=m
MICROSEMI_PHY all=m
+MOTORCOMM_PHY=m
NATIONAL_PHY all=m
NXP_C45_TJA11XX_PHY all=m
NXP_TJA11XX_PHY all=m
@@ -7226,8 +7190,10 @@ ZD1211RW_DEBUG all=n
#- *** FILE: drivers/net/wwan/Kconfig ***
#-
WWAN all=y
-WWAN_CORE all=m
+WWAN_HWSIM=m
MHI_WWAN_CTRL all=m
+RPMSG_WWAN_CTRL=m
+IOSM=m
#-
#- *** FILE: drivers/nfc/Kconfig ***
@@ -7535,6 +7501,7 @@ PCCARD_NONSTATIC all=y
#-
GENERIC_PHY all=y
USB_LGM_PHY all=m
+PHY_CAN_TRANSCEIVER=m
#- file drivers/phy/allwinner/Kconfig goes here
#- file drivers/phy/amlogic/Kconfig goes here
#- file drivers/phy/broadcom/Kconfig goes here
@@ -7757,7 +7724,7 @@ FUJITSU_LAPTOP all=m
FUJITSU_TABLET all=m
GPD_POCKET_FAN all=m
HP_ACCEL all=m
-HP_WIRELESS all=m
+WIRELESS_HOTKEY=m
HP_WMI all=m
TC1100_WMI all=m
IBM_RTL all=m
@@ -7770,9 +7737,10 @@ THINKPAD_ACPI_DEBUG i386=n x86_64=n
THINKPAD_ACPI_UNSAFE_LEDS all=n
THINKPAD_ACPI_VIDEO all=y
THINKPAD_ACPI_HOTKEY_POLL all=y
+THINKPAD_LMI=m
+#- file drivers/platform/x86/intel/Kconfig goes here
INTEL_ATOMISP2_LED all=m
INTEL_ATOMISP2_PM all=m
-INTEL_CHT_INT33FE all=m
INTEL_HID_EVENT all=m
INTEL_INT0002_VGPIO all=m
INTEL_MENLOW all=m
@@ -7832,10 +7800,28 @@ DELL_SMBIOS_WMI all=y
DELL_SMBIOS_SMM all=y
DELL_SMO8800 all=m
DELL_WMI all=m
+DELL_WMI_PRIVACY=y
DELL_WMI_AIO all=m
DELL_WMI_LED all=m
DELL_WMI_SYSMAN all=m
+#-
+#- *** FILE: drivers/platform/x86/intel/Kconfig ***
+#-
+X86_PLATFORM_DRIVERS_INTEL=y
+#- file drivers/platform/x86/intel/int33fe/Kconfig goes here
+#- file drivers/platform/x86/intel/int3472/Kconfig goes here
+
+#-
+#- *** FILE: drivers/platform/x86/intel/int33fe/Kconfig ***
+#-
+INTEL_CHT_INT33FE all=m
+
+#-
+#- *** FILE: drivers/platform/x86/intel/int3472/Kconfig ***
+#-
+INTEL_SKL_INT3472=m
+
#-
#- *** FILE: drivers/platform/x86/intel_speed_select_if/Kconfig ***
#-
@@ -8068,6 +8054,7 @@ REGULATOR_MAX14577 all=m
REGULATOR_MAX1586 all=m
REGULATOR_MAX8649 all=m
REGULATOR_MAX8660 all=m
+REGULATOR_MAX8893=m
REGULATOR_MAX8907 all=m
REGULATOR_MAX8952 all=m
REGULATOR_MAX8973 all=m
@@ -8080,6 +8067,7 @@ REGULATOR_MT6311 all=m
REGULATOR_MT6315 all=m
REGULATOR_MT6323 all=m
REGULATOR_MT6358 all=m
+REGULATOR_MT6359=m
REGULATOR_MT6360 all=m
REGULATOR_MT6397 all=m
REGULATOR_PCA9450 all=m
@@ -8095,7 +8083,10 @@ REGULATOR_QCOM_USB_VBUS all=m
REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY all=m
REGULATOR_RN5T618 all=m
REGULATOR_RT4801 all=m
+REGULATOR_RT4831=m
REGULATOR_RT5033 all=m
+REGULATOR_RT6160=m
+REGULATOR_RT6245=m
REGULATOR_RTMV20 all=m
REGULATOR_SKY81452 all=m
REGULATOR_SLG51000 all=m
@@ -8321,6 +8312,7 @@ SCSI_ARCMSR all=m sparc=n
#- file drivers/scsi/esas2r/Kconfig goes here
#- file drivers/scsi/megaraid/Kconfig.megaraid goes here
#- file drivers/scsi/mpt3sas/Kconfig goes here
+#- file drivers/scsi/mpi3mr/Kconfig goes here
#- file drivers/scsi/smartpqi/Kconfig goes here
#- file drivers/scsi/ufs/Kconfig goes here
SCSI_HPTIOP all=m sparc=n
@@ -8373,6 +8365,7 @@ SCSI_QLOGICPTI sparc=m sparc64=m
#- file drivers/scsi/qedf/Kconfig goes here
SCSI_LPFC all=m sparc=n
SCSI_LPFC_DEBUG_FS all=n
+#- file drivers/scsi/elx/Kconfig goes here
SCSI_SIM710 alpha=m i386=m
SCSI_DC395x all=m
SCSI_AM53C974 all=m
@@ -8458,6 +8451,11 @@ SCSI_DH_HP_SW all=m
SCSI_DH_EMC all=m
SCSI_DH_ALUA all=m
+#-
+#- *** FILE: drivers/scsi/elx/Kconfig ***
+#-
+SCSI_EFCT=m
+
#-
#- *** FILE: drivers/scsi/esas2r/Kconfig ***
#-
@@ -8479,6 +8477,11 @@ MEGARAID_MAILBOX all=m
MEGARAID_LEGACY all=m
MEGARAID_SAS all=m
+#-
+#- *** FILE: drivers/scsi/mpi3mr/Kconfig ***
+#-
+SCSI_MPI3MR=m
+
#-
#- *** FILE: drivers/scsi/mpt3sas/Kconfig ***
#-
@@ -8628,6 +8631,7 @@ SPI_SLAVE_SYSTEM_CONTROL all=m
#- *** FILE: drivers/spmi/Kconfig ***
#-
SPMI all=m
+SPMI_HISI3670 all=m
#-
#- *** FILE: drivers/ssb/Kconfig ***
@@ -8679,7 +8683,6 @@ STAGING all=y
#- file drivers/staging/mt7621-dts/Kconfig goes here
#- file drivers/staging/axis-fifo/Kconfig goes here
#- file drivers/staging/fieldbus/Kconfig goes here
-#- file drivers/staging/kpc2000/Kconfig goes here
#- file drivers/staging/qlge/Kconfig goes here
#- file drivers/staging/wfx/Kconfig goes here
#- file drivers/staging/hikey9xx/Kconfig goes here
@@ -8772,11 +8775,6 @@ GREYBUS_USB all=m
#-
GS_FPGABOOT all=m
-#-
-#- *** FILE: drivers/staging/hikey9xx/Kconfig ***
-#-
-SPMI_HISI3670 all=m
-
#-
#- *** FILE: drivers/staging/iio/accel/Kconfig ***
#-
@@ -8824,11 +8822,6 @@ ADE7854_SPI all=m
#-
AD2S1210 all=m
-#-
-#- *** FILE: drivers/staging/kpc2000/Kconfig ***
-#-
-KPC2000 all=n
-
#-
#- *** FILE: drivers/staging/ks7010/Kconfig ***
#-
@@ -8849,6 +8842,7 @@ STAGING_MEDIA all=y
#- file drivers/staging/media/zoran/Kconfig goes here
#- file drivers/staging/media/tegra-video/Kconfig goes here
#- file drivers/staging/media/ipu3/Kconfig goes here
+#- file drivers/staging/media/av7110/Kconfig goes here
#-
#- *** FILE: drivers/staging/media/atomisp/Kconfig ***
@@ -8870,6 +8864,14 @@ VIDEO_ATOMISP_OV2680 all=m
VIDEO_ATOMISP_OV5693 all=m
VIDEO_ATOMISP_LM3554 all=m
+#-
+#- *** FILE: drivers/staging/media/av7110/Kconfig ***
+#-
+DVB_AV7110 all=m sparc=n
+DVB_AV7110_OSD all=y
+DVB_BUDGET_PATCH all=m
+DVB_SP8870 all=m
+
#-
#- *** FILE: drivers/staging/media/ipu3/Kconfig ***
#-
@@ -9776,7 +9778,6 @@ VFIO_NOIOMMU all=y
#- *** FILE: drivers/vfio/mdev/Kconfig ***
#-
VFIO_MDEV all=m
-VFIO_MDEV_DEVICE all=m
#-
#- *** FILE: drivers/vfio/pci/Kconfig ***
@@ -9825,6 +9826,7 @@ LCD_PLATFORM all=m
LCD_AMS369FG06 all=m
LCD_LMS501KF03 all=m
LCD_HX8357 all=m
+LCD_OTM3225A all=m
BACKLIGHT_CLASS_DEVICE all=y
BACKLIGHT_KTD253 all=m
BACKLIGHT_LM3533 all=m
@@ -9834,6 +9836,7 @@ BACKLIGHT_DA903X all=m
BACKLIGHT_DA9052 all=m
BACKLIGHT_APPLE all=m
BACKLIGHT_QCOM_WLED all=m
+BACKLIGHT_RT4831=m
BACKLIGHT_SAHARA all=m
BACKLIGHT_WM831X all=m
BACKLIGHT_ADP8860 all=m
@@ -9989,6 +9992,7 @@ FB_MB862XX_I2C all=y
FB_BROADSHEET all=m
FB_HYPERV all=m
FB_SIMPLE all=y
+FB_SSD1307=m
FB_SM712 all=m
#- file drivers/video/fbdev/omap/Kconfig goes here
#- file drivers/video/fbdev/omap2/Kconfig goes here
@@ -10128,6 +10132,7 @@ WATCHDOG_NOWAYOUT all=n
WATCHDOG_HANDLE_BOOT_ENABLED all=y
WATCHDOG_OPEN_TIMEOUT all=0
WATCHDOG_SYSFS all=y
+WATCHDOG_HRTIMER_PRETIMEOUT=n
#- Watchdog Pretimeout Governors
WATCHDOG_PRETIMEOUT_GOV all=y
WATCHDOG_PRETIMEOUT_GOV_NOOP all=m
@@ -10293,6 +10298,7 @@ TMPFS_POSIX_ACL all=y
TMPFS_XATTR all=y
TMPFS_INODE64 all=y
HUGETLBFS all=y alpha= sparc= sparc64=y
+HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON=y
#- file fs/configfs/Kconfig goes here
#- file fs/efivarfs/Kconfig goes here
MISC_FILESYSTEMS all=y
@@ -10347,7 +10353,6 @@ CORE_DUMP_DEFAULT_ELF_HEADERS all=y
BINFMT_SCRIPT all=y
BINFMT_AOUT alpha=m i386=m sparc=y
OSF4_COMPAT alpha=n
-BINFMT_EM86 alpha=m
BINFMT_MISC all=m
#-
@@ -11119,6 +11124,7 @@ HZ all=300 alpha=1024
PREEMPT_NONE all=n sparc64=y
PREEMPT_VOLUNTARY all=y sparc64=n
PREEMPT all=n
+SCHED_CORE=y
#-
#- *** FILE: kernel/bpf/Kconfig ***
@@ -11238,6 +11244,8 @@ STACK_TRACER all=y
IRQSOFF_TRACER all=n
SCHED_TRACER all=y
HWLAT_TRACER all=n
+OSNOISE_TRACER=n
+TIMERLAT_TRACER=n
MMIOTRACE x86=n
ENABLE_DEFAULT_TRACERS all=n
FTRACE_SYSCALLS all=y
@@ -11310,13 +11318,13 @@ CPU_RMAP all=y
GLOB_SELFTEST all=n
#- file lib/vdso/Kconfig goes here
#- file lib/fonts/Kconfig goes here
-STRING_SELFTEST all=n
#-
#- *** FILE: lib/Kconfig.debug ***
#-
PRINTK_TIME all=y
PRINTK_CALLER all=y
+STACKTRACE_BUILD_ID=y
CONSOLE_LOGLEVEL_DEFAULT all=7
CONSOLE_LOGLEVEL_QUIET all=4
MESSAGE_LOGLEVEL_DEFAULT all=4
@@ -11450,10 +11458,12 @@ PERCPU_TEST all=m
ATOMIC64_SELFTEST all=n
ASYNC_RAID6_TEST all=m
TEST_HEXDUMP all=m
+STRING_SELFTEST all=n
TEST_STRING_HELPERS all=m
TEST_STRSCPY all=m
TEST_KSTRTOX all=m
TEST_PRINTF all=m
+TEST_SCANF=m
TEST_BITMAP all=m
TEST_UUID all=m
TEST_XARRAY all=m
@@ -11483,6 +11493,7 @@ TEST_MEMINIT all=m
TEST_HMM all=m
TEST_FREE_PAGES all=m
TEST_FPU all=m
+TEST_CLOCKSOURCE_WATCHDOG=m
MEMTEST all=y
HYPERV_TESTING all=y
#- file Documentation/Kconfig goes here
@@ -11577,7 +11588,6 @@ XZ_DEC_TEST all=m
#- *** FILE: mm/Kconfig ***
#-
FLATMEM_MANUAL all=n alpha=y ppc=y sparc=y sparc64=n
-DISCONTIGMEM_MANUAL all=n
SPARSEMEM_MANUAL all=y alpha=n arm=n ppc=n sparc=n sparc64=y
SPARSEMEM_VMEMMAP all=y
MEMORY_HOTPLUG all=y
@@ -12220,11 +12230,13 @@ MPTCP_IPV6 all=y
#-
NET_NCSI all=y
NCSI_OEM_CMD_GET_MAC all=y
+NCSI_OEM_CMD_KEEP_PHY=y
#-
#- *** FILE: net/netfilter/Kconfig ***
#-
NETFILTER_INGRESS all=y
+NETFILTER_NETLINK_HOOK=m
NETFILTER_NETLINK_ACCT all=m
NETFILTER_NETLINK_QUEUE all=m
NETFILTER_NETLINK_LOG all=m
@@ -13364,6 +13376,7 @@ SND_SOC_SIMPLE_AMPLIFIER all=m
SND_SOC_SIMPLE_MUX all=m
SND_SOC_SPDIF all=m
SND_SOC_SSM2305 all=m
+SND_SOC_SSM2518=m
SND_SOC_SSM2602_SPI all=m
SND_SOC_SSM2602_I2C all=m
SND_SOC_SSM4567 all=m
@@ -13380,6 +13393,7 @@ SND_SOC_TAS5720 all=m
SND_SOC_TAS6424 all=m
SND_SOC_TDA7419 all=m
SND_SOC_TFA9879 all=m
+SND_SOC_TFA989X=m
SND_SOC_TLV320AIC23 all=m
SND_SOC_TLV320AIC23_I2C all=m
SND_SOC_TLV320AIC23_SPI all=m
@@ -13396,6 +13410,7 @@ SND_SOC_TSCS454 all=m
SND_SOC_UDA1334 all=m
SND_SOC_WCD9335 all=m
SND_SOC_WCD934X all=m
+SND_SOC_WCD938X_SDW=m
SND_SOC_WM1250_EV1 all=m
SND_SOC_WM8510 all=m
SND_SOC_WM8523 all=m
@@ -13424,7 +13439,6 @@ SND_SOC_WM8985 all=m
SND_SOC_WM8991 all=m
SND_SOC_WSA881X all=m
SND_SOC_ZL38060 all=m
-SND_SOC_ZX_AUD96P22 all=m
SND_SOC_LM4857 all=m
SND_SOC_MAX9759 all=m
SND_SOC_MT6351 all=m
@@ -13541,6 +13555,7 @@ SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH all=m
SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH all=m
SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH all=m
SND_SOC_INTEL_SOF_RT5682_MACH all=m
+SND_SOC_INTEL_SOF_CS42L42_MACH=m
SND_SOC_INTEL_SOF_PCM512x_MACH all=m
SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH all=m
SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH all=m
@@ -13683,30 +13698,107 @@ RD_ZSTD all=y
#-
AB3100_CORE all=y
AB3100_OTP all=m
+BINFMT_EM86 alpha=m
+BLK_DEV_4DRIVES alpha=m i386=m
+BLK_DEV_AEC62XX all=m
+BLK_DEV_ALI14XX alpha=m i386=m
+BLK_DEV_ALI15X3 all=m
+BLK_DEV_AMD74XX all=m ppc=n ppc64=n
+BLK_DEV_ATIIXP i386=m x86_64=m
+BLK_DEV_CMD640 i386=m x86_64=n
+BLK_DEV_CMD640_ENHANCED i386=y
+BLK_DEV_CMD64X all=m
+BLK_DEV_CS5520 all=m
+BLK_DEV_CS5530 all=m
+BLK_DEV_CS5535 i386=m
+BLK_DEV_CS5536 i386=m
+BLK_DEV_CY82C693 all=m
+BLK_DEV_DELKIN all=m
+BLK_DEV_DTC2278 alpha=m i386=m
+BLK_DEV_GENERIC all=m
+BLK_DEV_HPT366 all=m
+BLK_DEV_HT6560B alpha=m i386=m
+BLK_DEV_IDEACPI all=y
+BLK_DEV_IDECD all=m
+BLK_DEV_IDECS all=m
+BLK_DEV_IDEDMA_PCI all=y
+BLK_DEV_IDEPCI all=y
+BLK_DEV_IDEPNP all=m
+BLK_DEV_IDETAPE all=m
+#* BLK_DEV_IDE_PMAC could be 'm' but it fails to build with PMAC_MEDIABAY=y
+BLK_DEV_IDE_PMAC ppc=y ppc64=y
+BLK_DEV_IDE_PMAC_ATA100FIRST ppc=y ppc64=y
+BLK_DEV_IDE_SATA all=n
+BLK_DEV_IT8172 all=m
+BLK_DEV_IT8213 all=m
+BLK_DEV_IT821X all=m
+BLK_DEV_JMICRON all=m sparc64=n
+BLK_DEV_NS87415 all=m
+BLK_DEV_OFFBOARD all=n ppc=y ppc64=y
+BLK_DEV_OPTI621 all=m
+BLK_DEV_PDC202XX_NEW all=m
+BLK_DEV_PDC202XX_OLD all=m
+BLK_DEV_PIIX all=m
+BLK_DEV_PLATFORM all=n
+BLK_DEV_QD65XX alpha=m i386=m
+BLK_DEV_RZ1000 i386=m x86_64=n
+BLK_DEV_SC1200 all=m
+BLK_DEV_SIIMAGE all=m
+BLK_DEV_SIS5513 i386=m x86_64=m
+BLK_DEV_SL82C105 arm=m ppc=m ppc64=m
+BLK_DEV_SLC90E66 all=m
+BLK_DEV_SVWKS all=m
+BLK_DEV_TC86C001 all=m
+BLK_DEV_TRIFLEX all=m
+BLK_DEV_TRM290 all=m
+BLK_DEV_UMC8672 alpha=m i386=m
BLK_DEV_UMEM all=m
+BLK_DEV_VIA82CXXX all=m
+CAIF_HSI all=m
CYCLADES all=m
CYZ_INTR all=n
DEFCONFIG_LIST all="/lib/modules/$UNAME_RELEASE/.config"
DEFXX_MMIO all=n
DEVKMEM all=y
+DISCONTIGMEM_MANUAL all=n
DRM_AMDGPU_GART_DEBUGFS all=n
DRM_GMA600 all=y
EROFS_FS_CLUSTER_PAGE_LIMIT all=1
EXTCON_ARIZONA all=m
+HP_WIRELESS all=m
+#* on PowerPC IDE must be 'y' to be able to select BLK_DEV_IDE_PMAC
+IDE all=m ppc=y ppc64=y sparc=n
+IDEPCI_PCIBUS_ORDER all=n
+IDE_GD all=m
+IDE_GD_ATA all=y
+IDE_GD_ATAPI all=y
+IDE_GENERIC all=m
+IDE_PROC_FS all=y
+IDE_TASK_IOCTL all=y
+INFINIBAND_I40IW all=m
ISI all=m
-LCD_OTM3225A all=m
+KPC2000 all=n
LEDS_BLINK all=y
+MAX_RAW_DEVS all=1024
+MLXSW_SWITCHIB all=m
+MLXSW_SWITCHX2 all=m
MODULE_COMPRESS all=y
MOST_SOUND all=m
NF_LOG_BRIDGE all=m
NF_LOG_NETDEV all=m
+R3964 all=m
+RAW_DRIVER all=m
ROCKETPORT all=m
SENSORS_AMD_ENERGY all=m
+SND_SOC_ZX_AUD96P22 all=m
STAGING_APEX_DRIVER all=m
STAGING_GASKET_FRAMEWORK all=m
TRACE_ROUTER all=m
TRACE_SINK all=m
+VFIO_MDEV_DEVICE all=m
+VIDEO_IVTV_DEPRECATED_IOCTLS all=n
WIMAX all=m
WIMAX_DEBUG_LEVEL all=8
WIMAX_I2400M_DEBUG_LEVEL all=8
WIMAX_I2400M_USB all=m
+WWAN_CORE all=m
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/6d1765514cb22667c025eb69327c29f5a698444f
More information about the pld-cvs-commit
mailing list