[packages/kernel/LINUX_5_10] - 5.10.17

Mon Feb 22 22:55:08 CET 2021

commit bbc24bf2afe3d1d2b184623bf4a01cece1ed9e26
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Feb 22 22:54:35 2021 +0100

    - 5.10.17

 kernel-aufs5.patch          | 518 ++++++++++++++++++++++----------------------
 kernel-hostap.patch         |   2 +-
 kernel-layer7.patch         |  10 +-
 kernel-rndis_host-wm5.patch |   6 +-
 kernel.spec                 |   6 +-
 5 files changed, 271 insertions(+), 271 deletions(-)
---

diff --git a/kernel.spec b/kernel.spec
index c36c8ca8..83a53e4e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
 
 %define		rel		1
 %define		basever		5.10
-%define		postver		.16
+%define		postver		.17
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -127,7 +127,7 @@ Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5:	753adc474bf799d569dec4f165ed92c3
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	6eb3cfa9872f7c0cbc59e5c17eca854c
+# Patch0-md5:	4e76f7e770d75f54db4237349cfe653f
 %endif
 Source1:	kernel.sysconfig
 
@@ -201,7 +201,7 @@ Patch101:	kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs5-standalone.git
 # cd aufs5-standalone
-# git checkout -b aufs5.8 origin/aufs5.8
+# git checkout -b aufs5.10 origin/aufs5.10
 # cat aufs5-kbuild.patch aufs5-base.patch aufs5-mmap.patch aufs5-standalone.patch > ~/rpm/packages/kernel/kernel-aufs5.patch
 # rm -rf linux && mkdir linux; cp -a Documentation fs include linux
 # diff -urN /usr/share/empty linux | filterdiff -x linux/include/uapi/linux/Kbuild >> ~/rpm/packages/kernel/kernel-aufs5.patch
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 33c119f2..6e771072 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.10 kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
-index f08fbbfafd9a0..1c597cddc351c 100644
+index aa4c122823018..b29bad13b2491 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -267,6 +267,7 @@ source "fs/sysv/Kconfig"
+@@ -288,6 +288,7 @@ source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
  source "fs/erofs/Kconfig"
  source "fs/vboxsf/Kconfig"
@@ -14,7 +14,7 @@ index f08fbbfafd9a0..1c597cddc351c 100644
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
-index 2ce5112b02c86..d9b4a51985538 100644
+index 999d1a23f036c..0cd76857ca764 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
 @@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
@@ -23,13 +23,13 @@ index 2ce5112b02c86..d9b4a51985538 100644
  obj-$(CONFIG_ZONEFS_FS)		+= zonefs/
 +obj-$(CONFIG_AUFS_FS)           += aufs/
 SPDX-License-Identifier: GPL-2.0
-aufs5.x-rcN base patch
+aufs5.10 base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 50659d76976b7..80f67140e4f70 100644
+index 281de213ef478..ffc3c1c539ea2 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2946,6 +2946,19 @@ F:	include/linux/audit.h
+@@ -3009,6 +3009,19 @@ F:	include/linux/audit.h
  F:	include/uapi/linux/audit.h
  F:	kernel/audit*
  
@@ -37,12 +37,12 @@ index 50659d76976b7..80f67140e4f70 100644
 +M:	"J. R. Okajima" <hooanon05g at gmail.com>
 +L:	aufs-users at lists.sourceforge.net (members only)
 +L:	linux-unionfs at vger.kernel.org
++S:	Supported
 +W:	http://aufs.sourceforge.net
 +T:	git://github.com/sfjro/aufs4-linux.git
-+S:	Supported
-+F:	Documentation/filesystems/aufs/
 +F:	Documentation/ABI/testing/debugfs-aufs
 +F:	Documentation/ABI/testing/sysfs-aufs
++F:	Documentation/filesystems/aufs/
 +F:	fs/aufs/
 +F:	include/uapi/linux/aufs_type.h
 +
@@ -50,10 +50,10 @@ index 50659d76976b7..80f67140e4f70 100644
  M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis at gmail.com>
  S:	Maintained
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index da693e6a834e5..0479902a0cd50 100644
+index a58084c2ed7ce..7be7ca3f54547 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -753,6 +753,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -765,6 +765,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	return error;
  }
  
@@ -79,10 +79,10 @@ index da693e6a834e5..0479902a0cd50 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index b280e07e162b1..046000653e4d8 100644
+index ea0485861d937..ddca6240e0db4 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1266,7 +1266,7 @@ enum d_walk_ret {
+@@ -1285,7 +1285,7 @@ enum d_walk_ret {
   *
   * The @enter() callbacks are called with d_lock held.
   */
@@ -92,7 +92,7 @@ index b280e07e162b1..046000653e4d8 100644
  {
  	struct dentry *this_parent;
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 2e4c0fa2074b0..0b28a37f7e505 100644
+index 19ac5baad50fd..073ca6af500f3 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -32,7 +32,7 @@
@@ -114,10 +114,10 @@ index 2e4c0fa2074b0..0b28a37f7e505 100644
  		return error;
  
 diff --git a/fs/inode.c b/fs/inode.c
-index 93d9252a00ab4..7700c5e4783b9 100644
+index 9d78c37b00b81..e7f0c614a58f3 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1688,7 +1688,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1770,7 +1770,7 @@ EXPORT_SYMBOL(generic_update_time);
   * This does the actual work of updating an inodes time or version.  Must have
   * had called mnt_want_write() before calling this.
   */
@@ -127,10 +127,10 @@ index 93d9252a00ab4..7700c5e4783b9 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 a28e4db075ede..12e725e34c6ca 100644
+index cebaa3e817940..451dee24a546a 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -776,6 +776,12 @@ static inline int check_mnt(struct mount *mnt)
+@@ -792,6 +792,12 @@ static inline int check_mnt(struct mount *mnt)
  	return mnt->mnt_ns == current->nsproxy->mnt_ns;
  }
  
@@ -144,10 +144,10 @@ index a28e4db075ede..12e725e34c6ca 100644
   * vfsmount lock must be held for write
   */
 diff --git a/fs/splice.c b/fs/splice.c
-index 4e53efbd621db..9f230ee854e20 100644
+index 866d5c2367b23..55b5356262085 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -849,8 +849,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -756,8 +756,8 @@ static int warn_unsupported(struct file *file, const char *op)
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -156,9 +156,9 @@ index 4e53efbd621db..9f230ee854e20 100644
 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 +		    loff_t *ppos, size_t len, unsigned int flags)
  {
- 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
- 				loff_t *, size_t, unsigned int);
-@@ -866,9 +866,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ 	if (unlikely(!out->f_op->splice_write))
+ 		return warn_unsupported(out, "write");
+@@ -767,9 +767,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  /*
   * Attempt to initiate a splice from a file to a pipe.
   */
@@ -169,10 +169,10 @@ index 4e53efbd621db..9f230ee854e20 100644
 +		  struct pipe_inode_info *pipe, size_t len,
 +		  unsigned int flags)
  {
- 	ssize_t (*splice_read)(struct file *, loff_t *,
- 			       struct pipe_inode_info *, size_t, unsigned int);
+ 	int ret;
+ 
 diff --git a/fs/sync.c b/fs/sync.c
-index 4d1ff010bc5af..457f4e4a5cc1f 100644
+index 1373a610dc784..b7b5a0a0df6ff 100644
 --- a/fs/sync.c
 +++ b/fs/sync.c
 @@ -28,7 +28,7 @@
@@ -185,10 +185,10 @@ index 4d1ff010bc5af..457f4e4a5cc1f 100644
  	if (wait)
  		sync_inodes_sb(sb);
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 45cc10cdf6ddd..916efd7e612b3 100644
+index 8667d0cdc71e7..837dd6e727e45 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1370,6 +1370,7 @@
+@@ -1332,6 +1332,7 @@ extern void fasync_free(struct fasync_struct *);
  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  
@@ -196,7 +196,7 @@ index 45cc10cdf6ddd..916efd7e612b3 100644
  extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
  extern int f_setown(struct file *filp, unsigned long arg, int force);
  extern void f_delown(struct file *filp);
-@@ -1858,6 +1859,7 @@
+@@ -1843,6 +1844,7 @@ struct file_operations {
  	ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
  	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
  	int (*check_flags)(int);
@@ -204,7 +204,7 @@ index 45cc10cdf6ddd..916efd7e612b3 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);
-@@ -2362,6 +2370,7 @@
+@@ -2328,6 +2330,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 45cc10cdf6ddd..916efd7e612b3 100644
  
  /* /sys/fs */
  extern struct kobject *fs_kobj;
-@@ -2549,6 +2558,7 @@
+@@ -2564,6 +2567,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
  }
  
  void emergency_thaw_all(void);
@@ -221,10 +221,10 @@ index 45cc10cdf6ddd..916efd7e612b3 100644
  extern const struct file_operations def_blk_fops;
  extern const struct file_operations def_chr_fops;
 diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index 206774ac69460..e5eda5226fbc7 100644
+index f5594879175a6..93bb861981675 100644
 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
-@@ -376,6 +376,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
+@@ -241,6 +241,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
  	return lock->key == key;
  }
  
@@ -233,7 +233,7 @@ index 206774ac69460..e5eda5226fbc7 100644
  /*
   * Acquire a lock.
   *
-@@ -521,6 +523,7 @@ struct lockdep_map { };
+@@ -375,6 +377,7 @@ static inline void lockdep_unregister_key(struct lock_class_key *key)
  
  #define lockdep_depth(tsk)	(0)
  
@@ -242,10 +242,10 @@ index 206774ac69460..e5eda5226fbc7 100644
  
  #define lockdep_assert_held(l)			do { (void)(l); } while (0)
 diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
-index 35942084cd40d..24f5fd1a789de 100644
+index 8f882f5881e87..6b9808f098435 100644
 --- a/include/linux/mnt_namespace.h
 +++ b/include/linux/mnt_namespace.h
-@@ -7,12 +7,15 @@
+@@ -7,12 +7,15 @@ struct mnt_namespace;
  struct fs_struct;
  struct user_namespace;
  struct ns_common;
@@ -262,10 +262,10 @@ index 35942084cd40d..24f5fd1a789de 100644
  extern const struct file_operations proc_mountinfo_operations;
  extern const struct file_operations proc_mountstats_operations;
 diff --git a/include/linux/splice.h b/include/linux/splice.h
-index ebbbfea48aa0b..d68d574250283 100644
+index a55179fd60fc3..8e21c53cf8831 100644
 --- a/include/linux/splice.h
 +++ b/include/linux/splice.h
-@@ -90,4 +90,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
+@@ -93,4 +93,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
  
  extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
  extern const struct pipe_buf_operations default_pipe_buf_ops;
@@ -277,10 +277,10 @@ index ebbbfea48aa0b..d68d574250283 100644
 +			 unsigned int flags);
  #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index ac10db66cc63f..837a3358e77ca 100644
+index c1418b47f625a..7f006a47790cf 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -169,7 +169,7 @@ static
+@@ -188,7 +188,7 @@ static
  struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
  static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
  
@@ -289,7 +289,7 @@ index ac10db66cc63f..837a3358e77ca 100644
  {
  	unsigned int class_idx = hlock->class_idx;
  
-@@ -190,6 +190,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
+@@ -209,6 +209,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
  	 */
  	return lock_classes + class_idx;
  }
@@ -298,13 +298,13 @@ index ac10db66cc63f..837a3358e77ca 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.10 mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index eb2255e95f62b..92f6062423c0c 100644
+index b362523a9829a..669448bb8a738 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2162,7 +2162,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2184,7 +2184,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
  	rc = -ENOENT;
  	vma = find_exact_vma(mm, vm_start, vm_end);
  	if (vma && vma->vm_file) {
@@ -314,10 +314,10 @@ index eb2255e95f62b..92f6062423c0c 100644
  		rc = 0;
  	}
 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index 14c2badb8fd93..65afe5287e43e 100644
+index 13452b32e2bd5..38acccfef9d49 100644
 --- a/fs/proc/nommu.c
 +++ b/fs/proc/nommu.c
-@@ -41,7 +41,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
+@@ -40,7 +40,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
  	file = region->vm_file;
  
  	if (file) {
@@ -330,7 +330,7 @@ index 14c2badb8fd93..65afe5287e43e 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 8d382d4ec0672..93a768f754c91 100644
+index ee5a235b30562..80a46dcede7be 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)
@@ -345,7 +345,7 @@ index 8d382d4ec0672..93a768f754c91 100644
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1787,7 +1790,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1855,7 +1858,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;
@@ -355,7 +355,7 @@ index 8d382d4ec0672..93a768f754c91 100644
  	struct mempolicy *pol;
  	char buffer[64];
 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 7907e6419e572..d17209cf52bc3 100644
+index a6d21fc0033c6..02c2de31196e0 100644
 --- a/fs/proc/task_nommu.c
 +++ b/fs/proc/task_nommu.c
 @@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
@@ -371,10 +371,10 @@ index 7907e6419e572..d17209cf52bc3 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 f3fe7371855ce..a5b9751a5b331 100644
+index db6ae4d3fb4ed..1a632192d9d9f 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1688,6 +1688,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1712,6 +1712,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
  	unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  
@@ -404,10 +404,10 @@ index f3fe7371855ce..a5b9751a5b331 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 4aba6c0c2ba80..974802987f69d 100644
+index 5a9238f6caad9..ad387c3cb14fc 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -272,6 +272,7 @@ struct vm_region {
+@@ -280,6 +280,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 */
@@ -415,7 +415,7 @@ index 4aba6c0c2ba80..974802987f69d 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
-@@ -351,6 +352,7 @@ struct vm_area_struct {
+@@ -359,6 +360,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). */
@@ -424,24 +424,24 @@ index 4aba6c0c2ba80..974802987f69d 100644
  
  #ifdef CONFIG_SWAP
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 48ed22774efaa..d7439388c1c52 100644
+index 6d266388d3804..dd7f13c3bee7d 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -568,7 +568,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -554,7 +554,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
  			struct inode *inode = file_inode(file);
  			struct address_space *mapping = file->f_mapping;
  
 -			get_file(file);
 +			vma_get_file(tmp);
  			if (tmp->vm_flags & VM_DENYWRITE)
- 				atomic_dec(&inode->i_writecount);
+ 				put_write_access(inode);
  			i_mmap_lock_write(mapping);
 diff --git a/mm/Makefile b/mm/Makefile
-index fccd3756b25f0..51485ceec650a 100644
+index d73aed0fc99c1..93076a66ad6a5 100644
 --- a/mm/Makefile
 +++ b/mm/Makefile
-@@ -44,7 +44,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
- 			   mm_init.o mmu_context.o percpu.o slab_common.o \
+@@ -52,7 +52,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
+ 			   mm_init.o percpu.o slab_common.o \
  			   compaction.o vmacache.o \
  			   interval_tree.o list_lru.o workingset.o \
 -			   debug.o gup.o $(mmu-y)
@@ -450,10 +450,10 @@ index fccd3756b25f0..51485ceec650a 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 23a051a7ef0fb..e2fe9132feb21 100644
+index 0b2067b3c3283..3334207431c79 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -2660,7 +2660,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -2909,7 +2909,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
  	vm_fault_t ret = VM_FAULT_LOCKED;
  
  	sb_start_pagefault(inode->i_sb);
@@ -463,7 +463,7 @@ index 23a051a7ef0fb..e2fe9132feb21 100644
  	if (page->mapping != inode->i_mapping) {
  		unlock_page(page);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index f609e9ec4a253..d554b349c653c 100644
+index 5c8b4485860de..59f2f758d77e5 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -475,7 +475,7 @@ index f609e9ec4a253..d554b349c653c 100644
  	mpol_put(vma_policy(vma));
  	vm_area_free(vma);
  	return next;
-@@ -910,7 +910,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
+@@ -951,7 +951,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
  	if (remove_next) {
  		if (file) {
  			uprobe_munmap(next, next->vm_start, next->vm_end);
@@ -484,7 +484,7 @@ index f609e9ec4a253..d554b349c653c 100644
  		}
  		if (next->anon_vma)
  			anon_vma_merge(vma, next);
-@@ -1831,8 +1831,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1897,8 +1897,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  	return addr;
  
  unmap_and_free_vma:
@@ -494,7 +494,7 @@ index f609e9ec4a253..d554b349c653c 100644
  
  	/* Undo any partial mapping done by a device driver. */
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2683,7 +2683,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2757,7 +2757,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  		goto out_free_mpol;
  
  	if (new->vm_file)
@@ -503,7 +503,7 @@ index f609e9ec4a253..d554b349c653c 100644
  
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
-@@ -2702,7 +2702,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2776,7 +2776,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)
@@ -512,7 +512,7 @@ index f609e9ec4a253..d554b349c653c 100644
  	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
-@@ -2894,7 +2894,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2969,7 +2969,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;
@@ -521,7 +521,7 @@ index f609e9ec4a253..d554b349c653c 100644
  
  	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
  		     current->comm, current->pid);
-@@ -2969,10 +2969,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -3044,10 +3044,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  		}
  	}
  
@@ -548,9 +548,9 @@ index f609e9ec4a253..d554b349c653c 100644
 +	if (prfile)
 +		fput(prfile);
  out:
- 	up_write(&mm->mmap_sem);
+ 	mmap_write_unlock(mm);
  	if (populate)
-@@ -3263,7 +3280,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3334,7 +3351,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)
@@ -560,10 +560,10 @@ index f609e9ec4a253..d554b349c653c 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 318df4e236c99..7f051e86ea1dd 100644
+index 0faf39b32cdb9..78ecad7204c86 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -567,7 +567,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -533,7 +533,7 @@ static void __put_nommu_region(struct vm_region *region)
  		up_write(&nommu_region_sem);
  
  		if (region->vm_file)
@@ -572,7 +572,7 @@ index 318df4e236c99..7f051e86ea1dd 100644
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -699,7 +699,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -665,7 +665,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
@@ -581,7 +581,7 @@ index 318df4e236c99..7f051e86ea1dd 100644
  	put_nommu_region(vma->vm_region);
  	vm_area_free(vma);
  }
-@@ -1222,7 +1222,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1188,7 +1188,7 @@ unsigned long do_mmap(struct file *file,
  					goto error_just_free;
  				}
  			}
@@ -590,7 +590,7 @@ index 318df4e236c99..7f051e86ea1dd 100644
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1299,10 +1299,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1265,10 +1265,10 @@ unsigned long do_mmap(struct file *file,
  	up_write(&nommu_region_sem);
  error:
  	if (region->vm_file)
@@ -696,13 +696,13 @@ index 0000000000000..00d51187c3250
 +}
 +#endif /* !CONFIG_MMU */
 SPDX-License-Identifier: GPL-2.0
-aufs5.x-rcN standalone patch
+aufs5.10 standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 046000653e4d8..15aa871d1b450 100644
+index ddca6240e0db4..30dec552278dc 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1371,6 +1371,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1390,6 +1390,7 @@ void d_walk(struct dentry *parent, void *data,
  	seq = 1;
  	goto again;
  }
@@ -710,7 +710,7 @@ index 046000653e4d8..15aa871d1b450 100644
  
  struct check_mount {
  	struct vfsmount *mnt;
-@@ -2916,6 +2917,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2935,6 +2936,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
  
  	write_sequnlock(&rename_lock);
  }
@@ -719,10 +719,10 @@ index 046000653e4d8..15aa871d1b450 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index 2c465119affcc..239bcb8906e78 100644
+index 547a2390baf54..18d51d0face68 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
-@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
+@@ -113,6 +113,7 @@ bool path_noexec(const struct path *path)
  	return (path->mnt->mnt_flags & MNT_NOEXEC) ||
  	       (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
  }
@@ -731,7 +731,7 @@ index 2c465119affcc..239bcb8906e78 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 0b28a37f7e505..f2c90a416b751 100644
+index 073ca6af500f3..b18afdf81e762 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
@@ -743,7 +743,7 @@ index 0b28a37f7e505..f2c90a416b751 100644
  static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
                       int force)
 diff --git a/fs/file_table.c b/fs/file_table.c
-index 30d55c9a1744a..34b9bbf4c5566 100644
+index 709ada3151da5..27a3e3c9f2a82 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
 @@ -162,6 +162,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
@@ -754,7 +754,7 @@ index 30d55c9a1744a..34b9bbf4c5566 100644
  
  /*
   * Variant of alloc_empty_file() that doesn't check and modify nr_files.
-@@ -375,6 +376,7 @@ void __fput_sync(struct file *file)
+@@ -376,6 +377,7 @@ void __fput_sync(struct file *file)
  }
  
  EXPORT_SYMBOL(fput);
@@ -763,10 +763,10 @@ index 30d55c9a1744a..34b9bbf4c5566 100644
  void __init files_init(void)
  {
 diff --git a/fs/inode.c b/fs/inode.c
-index 7700c5e4783b9..6284b41fcf3f0 100644
+index e7f0c614a58f3..6fe0a92a4c93c 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1694,6 +1694,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
+@@ -1776,6 +1776,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
  		return inode->i_op->update_time(inode, time, flags);
  	return generic_update_time(inode, time, flags);
  }
@@ -775,7 +775,7 @@ index 7700c5e4783b9..6284b41fcf3f0 100644
  /**
   *	touch_atime	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 12e725e34c6ca..fa17b9d5926ba 100644
+index 451dee24a546a..38078cbede431 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -786,7 +786,7 @@ index 12e725e34c6ca..fa17b9d5926ba 100644
  
  /**
   * mnt_drop_write - give up write access to a mount
-@@ -781,6 +782,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
+@@ -797,6 +798,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
  {
  	return check_mnt(real_mount(mnt));
  }
@@ -794,7 +794,7 @@ index 12e725e34c6ca..fa17b9d5926ba 100644
  
  /*
   * vfsmount lock must be held for write
-@@ -1903,6 +1905,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1961,6 +1963,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -803,10 +803,10 @@ index 12e725e34c6ca..fa17b9d5926ba 100644
  static void lock_mnt_tree(struct mount *mnt)
  {
 diff --git a/fs/notify/group.c b/fs/notify/group.c
-index 133f723aca070..0b9f7f6d8390f 100644
+index a4a4b1c64d32a..86dc2efb1850c 100644
 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
-@@ -99,6 +99,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
+@@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
  {
  	refcount_inc(&group->refcnt);
  }
@@ -815,7 +815,7 @@ index 133f723aca070..0b9f7f6d8390f 100644
  /*
   * Drop a reference to a group.  Free it if it's through.
 diff --git a/fs/open.c b/fs/open.c
-index 719b320ede52b..f88ce55c1c998 100644
+index 9af548fb841b0..2ff09b709f7bf 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@@ -827,19 +827,19 @@ index 719b320ede52b..f88ce55c1c998 100644
  long vfs_truncate(const struct path *path, loff_t length)
  {
 diff --git a/fs/read_write.c b/fs/read_write.c
-index 5d684d7d29207..6f61c0b6aa664 100644
+index 75f764b434184..7582bb3fb634b 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -469,6 +469,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
- 
+@@ -503,6 +503,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
+ 	inc_syscr(current);
  	return ret;
  }
 +EXPORT_SYMBOL_GPL(vfs_read);
  
  static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
  {
-@@ -589,6 +592,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
- 
+@@ -613,6 +614,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
+ 	file_end_write(file);
  	return ret;
  }
 +EXPORT_SYMBOL_GPL(vfs_write);
@@ -847,27 +847,27 @@ index 5d684d7d29207..6f61c0b6aa664 100644
  /* file_ppos returns &file->f_pos or NULL if file is stream */
  static inline loff_t *file_ppos(struct file *file)
 diff --git a/fs/splice.c b/fs/splice.c
-index 9f230ee854e20..a6bd05004433c 100644
+index 55b5356262085..c13ac0fbac318 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -862,6 +862,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- 
- 	return splice_write(pipe, out, ppos, len, flags);
+@@ -763,6 +763,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ 		return warn_unsupported(out, "write");
+ 	return out->f_op->splice_write(pipe, out, ppos, len, flags);
  }
 +EXPORT_SYMBOL_GPL(do_splice_from);
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -891,6 +892,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
- 
- 	return splice_read(in, ppos, pipe, len, flags);
+@@ -787,6 +788,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+ 		return warn_unsupported(in, "read");
+ 	return in->f_op->splice_read(in, ppos, pipe, len, flags);
  }
 +EXPORT_SYMBOL_GPL(do_splice_to);
  
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/fs/sync.c b/fs/sync.c
-index 457f4e4a5cc1f..67c66358f3fe4 100644
+index b7b5a0a0df6ff..fa5c7fba7f1ba 100644
 --- a/fs/sync.c
 +++ b/fs/sync.c
 @@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
@@ -879,10 +879,10 @@ index 457f4e4a5cc1f..67c66358f3fe4 100644
  /*
   * Write out and wait upon all dirty data associated with this
 diff --git a/fs/xattr.c b/fs/xattr.c
-index 91608d9bfc6aa..02d19ab3ba540 100644
+index cd7a563e8bcd4..7d989d57b0f0d 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
-@@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
+@@ -360,6 +360,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
  	*xattr_value = value;
  	return error;
  }
@@ -891,10 +891,10 @@ index 91608d9bfc6aa..02d19ab3ba540 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 837a3358e77ca..715ba9c1b91ae 100644
+index 7f006a47790cf..be002c3a30833 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -190,6 +190,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+@@ -209,6 +209,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
  	 */
  	return lock_classes + class_idx;
  }
@@ -903,19 +903,19 @@ index 837a3358e77ca..715ba9c1b91ae 100644
  
  #ifdef CONFIG_LOCK_STAT
 diff --git a/kernel/task_work.c b/kernel/task_work.c
-index 825f28259a19a..b77593b29c1a5 100644
+index 8d6e1217c451c..0e73637adda86 100644
 --- a/kernel/task_work.c
 +++ b/kernel/task_work.c
-@@ -126,3 +126,4 @@ void task_work_run(void)
+@@ -154,3 +154,4 @@ void task_work_run(void)
  		} while (work);
  	}
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/security.c b/security/security.c
-index 51de970fbb1ed..b21f1ffd90051 100644
+index a28045dc9e7f6..310cf38efeec7 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -1087,6 +1087,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -1093,6 +1093,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
  		return 0;
  	return call_int_hook(path_rmdir, 0, dir, dentry);
  }
@@ -923,7 +923,7 @@ index 51de970fbb1ed..b21f1ffd90051 100644
  
  int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {
-@@ -1103,6 +1104,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1109,6 +1110,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);
  }
@@ -931,7 +931,7 @@ index 51de970fbb1ed..b21f1ffd90051 100644
  
  int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -1111,6 +1113,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1117,6 +1119,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);
  }
@@ -939,7 +939,7 @@ index 51de970fbb1ed..b21f1ffd90051 100644
  
  int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
  			 const struct path *new_dir, struct dentry *new_dentry,
-@@ -1138,6 +1141,7 @@ int security_path_truncate(const struct path *path)
+@@ -1144,6 +1147,7 @@ int security_path_truncate(const struct path *path)
  		return 0;
  	return call_int_hook(path_truncate, 0, path);
  }
@@ -947,7 +947,7 @@ index 51de970fbb1ed..b21f1ffd90051 100644
  
  int security_path_chmod(const struct path *path, umode_t mode)
  {
-@@ -1145,6 +1149,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1151,6 +1155,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
  		return 0;
  	return call_int_hook(path_chmod, 0, path, mode);
  }
@@ -955,7 +955,7 @@ index 51de970fbb1ed..b21f1ffd90051 100644
  
  int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {
-@@ -1152,6 +1157,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1158,6 +1163,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);
  }
@@ -963,7 +963,7 @@ index 51de970fbb1ed..b21f1ffd90051 100644
  
  int security_path_chroot(const struct path *path)
  {
-@@ -1252,6 +1258,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -1258,6 +1264,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return call_int_hook(inode_permission, 0, inode, mask);
  }
@@ -971,7 +971,7 @@ index 51de970fbb1ed..b21f1ffd90051 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -1429,6 +1436,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -1450,6 +1457,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -981,7 +981,7 @@ index 51de970fbb1ed..b21f1ffd90051 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	2019-07-11 15:42:14.455570938 +0200
++++ linux/Documentation/ABI/testing/debugfs-aufs	2021-02-22 22:51:59.054745247 +0100
 @@ -0,0 +1,55 @@
 +What:		/debug/aufs/si_<id>/
 +Date:		March 2009
@@ -1040,7 +1040,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	2019-07-11 15:42:14.455570938 +0200
++++ linux/Documentation/ABI/testing/sysfs-aufs	2021-02-22 22:51:59.054745247 +0100
 @@ -0,0 +1,31 @@
 +What:		/sys/fs/aufs/si_<id>/
 +Date:		March 2009
@@ -1075,7 +1075,7 @@ 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	2020-01-27 10:57:18.162204582 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt	2021-02-22 22:51:59.054745247 +0100
 @@ -0,0 +1,171 @@
 +
 +# Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -1250,7 +1250,7 @@ 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	2020-01-27 10:57:18.162204582 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,258 @@
 +
 +# Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -1512,7 +1512,7 @@ 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	2020-01-27 10:57:18.162204582 +0100
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,85 @@
 +
 +# Copyright (C) 2015-2020 Junjiro R. Okajima
@@ -1601,7 +1601,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,113 @@
 +
 +# Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -1718,7 +1718,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,74 @@
 +
 +# Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -1796,7 +1796,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,64 @@
 +
 +# Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -1864,7 +1864,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	2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,31 @@
 +
 +// to view this graph, run dot(1) command in GRAPHVIZ.
@@ -1899,7 +1899,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,102 @@
 +
 +# Copyright (C) 2017-2020 Junjiro R. Okajima
@@ -2005,7 +2005,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,120 @@
 +
 +# Copyright (C) 2011-2020 Junjiro R. Okajima
@@ -2129,7 +2129,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,72 @@
 +
 +# Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -2205,7 +2205,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,96 @@
 +
 +# Copyright (C) 2014-2020 Junjiro R. Okajima
@@ -2305,7 +2305,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,58 @@
 +
 +# Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -2367,7 +2367,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,52 @@
 +
 +# Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -2423,7 +2423,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,47 @@
 +
 +# Copyright (C) 2010-2020 Junjiro R. Okajima
@@ -2474,7 +2474,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	2020-01-23 09:59:36.748660743 +0100
++++ linux/Documentation/filesystems/aufs/README	2021-02-22 22:51:59.054745247 +0100
 @@ -0,0 +1,401 @@
 +
 +Aufs5 -- advanced multi layered unification filesystem version 5.x
@@ -2879,7 +2879,7 @@ 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	2020-01-27 10:57:18.165538015 +0100
++++ linux/fs/aufs/aufs.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,62 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -2945,7 +2945,7 @@ 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	2020-08-03 09:14:46.095748745 +0200
++++ linux/fs/aufs/branch.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,1427 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -4376,7 +4376,7 @@ 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	2020-12-15 14:10:58.911356294 +0100
++++ linux/fs/aufs/branch.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,364 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -4744,7 +4744,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	2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/conf.mk	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,40 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -4788,7 +4788,7 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
 +-include ${srctree}/${src}/conf_priv.mk
 diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 --- /usr/share/empty/fs/aufs/cpup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c	2020-12-15 14:10:58.911356294 +0100
++++ linux/fs/aufs/cpup.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,1445 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -5488,7 +5488,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +	case S_IFCHR:
 +	case S_IFBLK:
 +		AuDebugOn(!capable(CAP_MKNOD));
-+		/*FALLTHROUGH*/
++		fallthrough;
 +	case S_IFIFO:
 +	case S_IFSOCK:
 +		err = vfsub_mknod(h_dir, &h_path, mode, h_inode->i_rdev);
@@ -6237,7 +6237,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/cpup.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,100 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -6341,7 +6341,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
 +#endif /* __AUFS_CPUP_H__ */
 diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 --- /usr/share/empty/fs/aufs/dbgaufs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dbgaufs.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,526 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -6871,7 +6871,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dbgaufs.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,53 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -6928,7 +6928,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dcsub.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,225 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -7157,7 +7157,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dcsub.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,137 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -7298,7 +7298,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/debug.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,441 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -7743,7 +7743,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/debug.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,226 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -7973,7 +7973,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
 +#endif /* __AUFS_DEBUG_H__ */
 diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 --- /usr/share/empty/fs/aufs/dentry.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dentry.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,1154 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -9131,7 +9131,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dentry.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,268 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -9403,7 +9403,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dinfo.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,554 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -9961,7 +9961,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dir.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,763 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -10728,7 +10728,7 @@ 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	2020-08-03 09:14:46.095748745 +0200
++++ linux/fs/aufs/dir.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,134 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -10866,7 +10866,7 @@ 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	2020-08-03 09:14:46.095748745 +0200
++++ linux/fs/aufs/dirren.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,1316 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -12186,7 +12186,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dirren.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,140 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -12330,7 +12330,7 @@ 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	2020-12-15 14:10:58.914689728 +0100
++++ linux/fs/aufs/dynop.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,368 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -12702,7 +12702,7 @@ 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	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dynop.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,77 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -12783,7 +12783,7 @@ 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	2020-12-15 14:10:58.914689728 +0100
++++ linux/fs/aufs/export.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,837 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -13624,7 +13624,7 @@ 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	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/fhsm.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,427 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -14055,8 +14055,8 @@ 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	2020-12-15 14:10:58.918023162 +0100
-@@ -0,0 +1,867 @@
++++ linux/fs/aufs/file.c	2021-02-22 22:51:59.058078584 +0100
+@@ -0,0 +1,863 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -14849,10 +14849,6 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +
 +/* they will never be called. */
 +#ifdef CONFIG_AUFS_DEBUG
-+/*
-+void aufs_readahead(struct readahead_control *)
-+{ AuUnsupport(); }
-+*/
 +static int aufs_write_begin(struct file *file, struct address_space *mapping,
 +			    loff_t pos, unsigned len, unsigned flags,
 +			    struct page **pagep, void **fsdata)
@@ -14926,7 +14922,7 @@ 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	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/file.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,342 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -15272,7 +15268,7 @@ 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	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/finfo.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,149 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -15425,7 +15421,7 @@ 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	2020-12-15 14:10:58.914689728 +0100
++++ linux/fs/aufs/f_op.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,762 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -16191,7 +16187,7 @@ 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	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/fstype.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,401 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -16596,7 +16592,7 @@ 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	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/hbl.h	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,65 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -16665,7 +16661,7 @@ 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	2020-12-15 14:10:58.918023162 +0100
++++ linux/fs/aufs/hfsnotify.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,288 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -16957,7 +16953,7 @@ 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	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/hfsplus.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,60 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -17021,7 +17017,7 @@ 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	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/hnotify.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,715 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -17609,7 +17605,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 +	case FS_MOVED_TO:
 +		au_fset_hnjob(flags[AuHn_CHILD], XINO0);
 +		au_fset_hnjob(flags[AuHn_CHILD], MNTPNT);
-+		/*FALLTHROUGH*/
++		fallthrough;
 +	case FS_CREATE:
 +		AuDebugOn(!h_child_name);
 +		break;
@@ -17740,7 +17736,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/iinfo.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,286 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -18030,7 +18026,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/inode.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,529 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -18563,7 +18559,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
 +}
 diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 --- /usr/share/empty/fs/aufs/inode.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h	2020-08-03 09:14:46.095748745 +0200
++++ linux/fs/aufs/inode.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,698 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -19160,7 +19156,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 +	int (*alloc)(struct au_hinode *hinode);
 +
 +	/*
-+	 * if it returns true, the the caller should free hinode->hi_notify,
++	 * if it returns true, the caller should free hinode->hi_notify,
 +	 * otherwise ->free() frees it.
 +	 */
 +	int (*free)(struct au_hinode *hinode,
@@ -19265,7 +19261,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/ioctl.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,220 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -19489,7 +19485,7 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
 +#endif
 diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 --- /usr/share/empty/fs/aufs/i_op_add.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/i_op_add.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,936 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -20429,7 +20425,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 --- /usr/share/empty/fs/aufs/i_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c	2020-08-03 09:14:46.095748745 +0200
++++ linux/fs/aufs/i_op.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,1502 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -21935,7 +21931,7 @@ 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	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/i_op_del.c	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,513 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -22452,7 +22448,7 @@ 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	2020-01-27 10:57:18.172204883 +0100
++++ linux/fs/aufs/i_op_ren.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,1250 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -23706,7 +23702,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	2019-07-11 15:42:14.458904362 +0200
++++ linux/fs/aufs/Kconfig	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,199 @@
 +# SPDX-License-Identifier: GPL-2.0
 +config AUFS_FS
@@ -23909,7 +23905,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/lcnt.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,186 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -24099,7 +24095,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/loop.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,148 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -24251,7 +24247,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/loop.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,55 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -24310,7 +24306,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	2019-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/magic.mk	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,31 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -24345,7 +24341,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	2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/Makefile	2021-02-22 22:51:59.058078584 +0100
 @@ -0,0 +1,46 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -24395,7 +24391,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/module.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,273 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -24672,7 +24668,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/module.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,166 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -24842,7 +24838,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/mvdown.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,706 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -25552,7 +25548,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/opts.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,1880 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -26063,7 +26059,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +			err = e;
 +			break;
 +		}
-+		/*FALLTHROUGH*/
++		fallthrough;
 +	case AuWbrCreate_MFS:
 +	case AuWbrCreate_PMFS:
 +		create->mfs_second = AUFS_MFS_DEF_SEC;
@@ -26795,7 +26791,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +
 +		case Opt_ignore:
 +			pr_warn("ignored %s\n", opt_str);
-+			/*FALLTHROUGH*/
++			fallthrough;
 +		case Opt_ignore_silent:
 +			skipped = 1;
 +			err = 0;
@@ -26851,7 +26847,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +	case AuWbrCreate_PMFSRR:
 +	case AuWbrCreate_PMFSRRV:
 +		sbinfo->si_wbr_mfs.mfsrr_watermark = create->mfsrr_watermark;
-+		/*FALLTHROUGH*/
++		fallthrough;
 +	case AuWbrCreate_MFS:
 +	case AuWbrCreate_MFSV:
 +	case AuWbrCreate_PMFS:
@@ -27071,7 +27067,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +		/* Always goto add, not fallthrough */
 +	case Opt_prepend:
 +		opt->add.bindex = 0;
-+		/* fallthrough */
++		fallthrough;
 +	add: /* indented label */
 +	case Opt_add:
 +		err = au_br_add(sb, &opt->add,
@@ -27436,7 +27432,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/opts.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,225 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -27665,7 +27661,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/plink.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,516 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28185,7 +28181,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/poll.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,51 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28240,7 +28236,7 @@ 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	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/posix_acl.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,105 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28349,7 +28345,7 @@ 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	2020-08-03 09:14:43.142321747 +0200
++++ linux/fs/aufs/procfs.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,170 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28523,7 +28519,7 @@ 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	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/rdu.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,384 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28911,8 +28907,8 @@ 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	2020-01-27 10:57:18.178871751 +0100
-@@ -0,0 +1,73 @@
++++ linux/fs/aufs/rwsem.h	2021-02-22 22:51:59.061411920 +0100
+@@ -0,0 +1,77 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
 + * Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -28948,17 +28944,21 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
 +/* to debug easier, do not make them inlined functions */
 +#define AuRwMustNoWaiters(rw)	AuDebugOn(rwsem_is_contended(rw))
 +/* rwsem_is_locked() is unusable */
-+#define AuRwMustReadLock(rw)	AuDebugOn(!lockdep_recursing(current) \
-+					  && debug_locks \
++#define AuRwMustReadLock(rw)	AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP)	\
++					  && !lockdep_recursing(current) \
++					  && debug_locks		\
 +					  && !lockdep_is_held_type(rw, 1))
-+#define AuRwMustWriteLock(rw)	AuDebugOn(!lockdep_recursing(current) \
-+					  && debug_locks \
++#define AuRwMustWriteLock(rw)	AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP)	\
++					  && !lockdep_recursing(current) \
++					  && debug_locks		\
 +					  && !lockdep_is_held_type(rw, 0))
-+#define AuRwMustAnyLock(rw)	AuDebugOn(!lockdep_recursing(current) \
-+					  && debug_locks \
++#define AuRwMustAnyLock(rw)	AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP)	\
++					  && !lockdep_recursing(current) \
++					  && debug_locks		\
 +					  && !lockdep_is_held(rw))
-+#define AuRwDestroy(rw)		AuDebugOn(!lockdep_recursing(current) \
-+					  && debug_locks \
++#define AuRwDestroy(rw)		AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP)	\
++					  && !lockdep_recursing(current) \
++					  && debug_locks		\
 +					  && lockdep_is_held(rw))
 +
 +#define au_rw_init(rw)	init_rwsem(rw)
@@ -28988,7 +28988,7 @@ 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	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/sbinfo.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,314 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -29306,7 +29306,7 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 --- /usr/share/empty/fs/aufs/super.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/super.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,1047 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -30357,7 +30357,7 @@ 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	2020-12-15 14:10:58.918023162 +0100
++++ linux/fs/aufs/super.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,587 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -30948,7 +30948,7 @@ 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	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/sysaufs.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,93 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -31045,7 +31045,7 @@ 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	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/sysaufs.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,102 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -31151,7 +31151,7 @@ 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	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/sysfs.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,374 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -31529,7 +31529,7 @@ 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	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/sysrq.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,149 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -31682,7 +31682,7 @@ 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	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/vdir.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,896 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -32582,7 +32582,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 --- /usr/share/empty/fs/aufs/vfsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c	2020-12-15 14:10:58.921356596 +0100
++++ linux/fs/aufs/vfsub.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,885 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -33471,7 +33471,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 --- /usr/share/empty/fs/aufs/vfsub.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/vfsub.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,354 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -33829,7 +33829,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 +#endif /* __AUFS_VFSUB_H__ */
 diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
 --- /usr/share/empty/fs/aufs/wbr_policy.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/wbr_policy.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,830 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -34663,7 +34663,7 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
 +};
 diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 --- /usr/share/empty/fs/aufs/whout.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/whout.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,1062 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -35729,7 +35729,7 @@ 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	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/whout.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,86 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -35819,7 +35819,7 @@ 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	2020-08-03 09:12:33.764880472 +0200
++++ linux/fs/aufs/wkq.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,372 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -36195,7 +36195,7 @@ 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	2020-01-27 10:57:18.182205184 +0100
++++ linux/fs/aufs/wkq.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,89 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -36288,7 +36288,7 @@ 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	2020-08-03 09:14:46.095748745 +0200
++++ linux/fs/aufs/xattr.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,356 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -36648,7 +36648,7 @@ 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	2020-12-15 14:10:58.924690030 +0100
++++ linux/fs/aufs/xino.c	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,1925 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -38577,7 +38577,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +}
 diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
 --- /usr/share/empty/include/uapi/linux/aufs_type.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h	2020-10-14 08:51:27.819581640 +0200
++++ linux/include/uapi/linux/aufs_type.h	2021-02-22 22:51:59.061411920 +0100
 @@ -0,0 +1,452 @@
 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +/*
@@ -38621,7 +38621,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-20200622"
++#define AUFS_VERSION	"5.10-20210215"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39032,14 +39032,14 @@ 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.10 loopback patch
 
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 0479902a0cd50..758c8ee4d4e6b 100644
+index 7be7ca3f54547..a163aeade6148 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -638,6 +638,15 @@ static inline void loop_update_dio(struct loop_device *lo)
- 			lo->use_dio);
+@@ -650,6 +650,15 @@ static inline void loop_update_dio(struct loop_device *lo)
+ 				lo->use_dio);
  }
  
 +static struct file *loop_real_file(struct file *file)
@@ -39054,7 +39054,7 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  static void loop_reread_partitions(struct loop_device *lo,
  				   struct block_device *bdev)
  {
-@@ -693,6 +702,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -705,6 +714,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  			  unsigned int arg)
  {
  	struct file	*file = NULL, *old_file;
@@ -39062,7 +39062,7 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  	int		error;
  	bool		partscan;
  
-@@ -712,12 +722,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -724,12 +734,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	file = fget(arg);
  	if (!file)
  		goto out_err;
@@ -39082,7 +39082,7 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  
  	error = -EINVAL;
  
-@@ -729,6 +746,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -741,6 +758,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;
@@ -39090,7 +39090,7 @@ index 0479902a0cd50..758c8ee4d4e6b 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));
-@@ -742,6 +760,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -754,6 +772,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	 * dependency.
  	 */
  	fput(old_file);
@@ -39099,7 +39099,7 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  	if (partscan)
  		loop_reread_partitions(lo, bdev);
  	return 0;
-@@ -750,6 +770,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -762,6 +782,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	mutex_unlock(&loop_ctl_mutex);
  	if (file)
  		fput(file);
@@ -39108,17 +39108,17 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  	return error;
  }
  
-@@ -973,7 +995,7 @@ static void loop_update_rotational(struct loop_device *lo)
- static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- 		       struct block_device *bdev, unsigned int arg)
+@@ -1090,7 +1112,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+ 			  struct block_device *bdev,
+ 			  const struct loop_config *config)
  {
 -	struct file	*file;
 +	struct file	*file, *f, *virt_file = NULL;
  	struct inode	*inode;
  	struct address_space *mapping;
  	struct block_device *claimed_bdev = NULL;
-@@ -989,6 +1011,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- 	file = fget(arg);
+@@ -1106,6 +1128,12 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+ 	file = fget(config->fd);
  	if (!file)
  		goto out;
 +	f = loop_real_file(file);
@@ -39130,7 +39130,7 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  
  	/*
  	 * If we don't hold exclusive handle for the device, upgrade to it
-@@ -1079,6 +1079,7 @@ static int loop_configure(struct loop_de
+@@ -1161,6 +1189,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;
@@ -39138,8 +39138,8 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  	lo->old_gfp_mask = mapping_gfp_mask(mapping);
  	mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
  
-@@ -1090,6 +1119,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- 		bd_abort_claiming(bdev, claimed_bdev, loop_set_fd);
+@@ -1214,6 +1243,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+ 		bd_abort_claiming(bdev, claimed_bdev, loop_configure);
  out_putf:
  	fput(file);
 +	if (virt_file)
@@ -39147,7 +39147,7 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  out:
  	/* This is safe: open() is still holding a reference. */
  	module_put(THIS_MODULE);
-@@ -1136,6 +1167,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
+@@ -1223,6 +1254,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;
@@ -39155,7 +39155,7 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  	gfp_t gfp = lo->old_gfp_mask;
  	struct block_device *bdev = lo->lo_device;
  	int err = 0;
-@@ -1159,6 +1191,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1246,6 +1278,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
  
  	spin_lock_irq(&lo->lo_lock);
  	lo->lo_backing_file = NULL;
@@ -39163,7 +39163,7 @@ index 0479902a0cd50..758c8ee4d4e6b 100644
  	spin_unlock_irq(&lo->lo_lock);
  
  	loop_release_xfer(lo);
-@@ -1242,6 +1275,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1329,6 +1362,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
  	 */
  	if (filp)
  		fput(filp);
@@ -39186,10 +39186,10 @@ index af75a5ee40944..1d847cb194ff6 100644
  	void		*key_data; 
  
 diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 6fb4a4ed8cc7f..ba9a959f2db27 100644
+index 5ef279a59bb14..6447c37f98756 100644
 --- a/fs/aufs/f_op.c
 +++ b/fs/aufs/f_op.c
-@@ -359,7 +359,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
+@@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
  	if (IS_ERR(h_file))
  		goto out;
  
@@ -39261,10 +39261,10 @@ index 589dd01220201..801e0a7faec59 100644
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 916efd7e612b3..68f536f42b2a0 100644
+index 837dd6e727e45..0a05534f8582f 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1985,6 +1985,10 @@ struct super_operations {
+@@ -1967,6 +1967,10 @@ struct super_operations {
  				  struct shrink_control *);
  	long (*free_cached_objects)(struct super_block *,
  				    struct shrink_control *);
diff --git a/kernel-hostap.patch b/kernel-hostap.patch
index 32f6c245..3d31b8b5 100644
--- a/kernel-hostap.patch
+++ b/kernel-hostap.patch
@@ -12,7 +12,7 @@ diff -ur linux-2.6.18-gentoo/drivers/net/wireless/intersil/hostap/hostap_80211_t
  		printk(KERN_DEBUG "%s: hostap_data_start_xmit: short skb "
  		       "(len=%d)\n", dev->name, skb->len);
 @@ -234,6 +237,7 @@
- 		memcpy(skb_put(skb, ETH_ALEN), &hdr.addr4, ETH_ALEN);
+ 		skb_put_data(skb, &hdr.addr4, ETH_ALEN);
  	}
  
 +xmit:
diff --git a/kernel-layer7.patch b/kernel-layer7.patch
index c06af650..b7390a08 100644
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -2050,7 +2050,7 @@
 --- linux-2.6.28-stock/net/netfilter/nf_conntrack_core.c	2009-01-07 16:05:35.000000000 -0600
 +++ linux-2.6.28/net/netfilter/nf_conntrack_core.c	2009-01-07 16:07:31.000000000 -0600
 @@ -201,6 +201,14 @@ destroy_conntrack(struct nf_conntrack *n
- 	 * too. */
+ 	 */
  	nf_ct_remove_expectations(ct);
  
 +	#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
@@ -2061,13 +2061,13 @@
 +	#endif
 +
 +
- 	/* We overload first tuple to link into unconfirmed or dying list.*/
- 	BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
- 	hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
+ 	nf_ct_del_from_dying_or_unconfirmed_list(ct);
+ 
+ 	local_bh_enable();
 --- linux-2.6.28-stock/net/netfilter/nf_conntrack_standalone.c	2009-01-07 16:05:35.000000000 -0600
 +++ linux-2.6.28/net/netfilter/nf_conntrack_standalone.c	2009-01-07 16:07:31.000000000 -0600
 @@ -165,6 +165,12 @@ static int ct_seq_show(struct seq_file *
- 
+ 	ct_show_zone(s, ct, NF_CT_DEFAULT_ZONE_DIR);
  	ct_show_delta_time(s, ct);
  
 +#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
diff --git a/kernel-rndis_host-wm5.patch b/kernel-rndis_host-wm5.patch
index 02d0d63c..a6806d66 100644
--- a/kernel-rndis_host-wm5.patch
+++ b/kernel-rndis_host-wm5.patch
@@ -1,12 +1,12 @@
 --- linux-2.6.22-rc3-orig/drivers/net/usb/rndis_host.c	2007-05-25 22:55:14.000000000 -0400
 +++ linux-2.6.22-rc3/drivers/net/usb/rndis_host.c	2007-05-27 17:06:16.000000000 -0400
 @@ -499,8 +499,7 @@
- 	net->hard_header_len += sizeof (struct rndis_data_hdr);
- 	dev->hard_mtu = net->mtu + net->hard_header_len;
+ 		goto fail_and_release;
+ 	}
  
 -	dev->rx_urb_size = dev->hard_mtu + (dev->maxpacket + 1);
 -	dev->rx_urb_size &= ~(dev->maxpacket - 1);
 +	dev->rx_urb_size = (dev->udev->speed == USB_SPEED_FULL) ? 16384 : 8192;
  	u.init->max_transfer_size = cpu_to_le32(dev->rx_urb_size);
  
- 	net->change_mtu = NULL;
+ 	net->netdev_ops = &rndis_netdev_ops;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/bbc24bf2afe3d1d2b184623bf4a01cece1ed9e26


