5.2.5+ 20200622

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

aufs5-base.patch

@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.2.5+ base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 677ef41cb012..c2a7491ddc68 100644
+index 677ef41cb012c..c2a7491ddc68d 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -2769,6 +2769,19 @@ F:	include/linux/audit.h
@@ -26,7 +26,7 @@ index 677ef41cb012..c2a7491ddc68 100644
  M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
  S:	Maintained
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index f11b7dc16e9d..1b723737592b 100644
+index f11b7dc16e9d4..1b723737592bc 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -746,6 +746,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -55,7 +55,7 @@ index f11b7dc16e9d..1b723737592b 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index c435398f2c81..a688a042d022 100644
+index c435398f2c819..a688a042d0221 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1247,7 +1247,7 @@ enum d_walk_ret {
@@ -68,7 +68,7 @@ index c435398f2c81..a688a042d022 100644
  {
  	struct dentry *this_parent;
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 3d40771e8e7c..12dd73930961 100644
+index 3d40771e8e7cf..12dd739309616 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -32,7 +32,7 @@
@@ -90,7 +90,7 @@ index 3d40771e8e7c..12dd73930961 100644
  		return error;
  
 diff --git a/fs/inode.c b/fs/inode.c
-index 2bf21e2c90fc..9b908c37971f 100644
+index 2bf21e2c90fc8..9b908c37971f2 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
 @@ -1670,7 +1670,7 @@ EXPORT_SYMBOL(generic_update_time);
@@ -103,7 +103,7 @@ index 2bf21e2c90fc..9b908c37971f 100644
  	int (*update_time)(struct inode *, struct timespec64 *, int);
  
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 6fbc9126367a..101dda59f39c 100644
+index 6fbc9126367a1..101dda59f39c4 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -120,7 +120,7 @@ index 6fbc9126367a..101dda59f39c 100644
   * vfsmount lock must be held for write
   */
 diff --git a/fs/read_write.c b/fs/read_write.c
-index c543d965e288..afaa864c0315 100644
+index c543d965e2880..afaa864c0315f 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
 @@ -498,6 +498,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
@@ -153,7 +153,7 @@ index c543d965e288..afaa864c0315 100644
  {
  	mm_segment_t old_fs;
 diff --git a/fs/splice.c b/fs/splice.c
-index 14cb602d9a2f..58d2692c5f30 100644
+index 14cb602d9a2f5..58d2692c5f308 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -834,8 +834,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
@@ -181,7 +181,7 @@ index 14cb602d9a2f..58d2692c5f30 100644
  	ssize_t (*splice_read)(struct file *, loff_t *,
  			       struct pipe_inode_info *, size_t, unsigned int);
 diff --git a/fs/sync.c b/fs/sync.c
-index 4d1ff010bc5a..457f4e4a5cc1 100644
+index 4d1ff010bc5af..457f4e4a5cc1f 100644
 --- a/fs/sync.c
 +++ b/fs/sync.c
 @@ -28,7 +28,7 @@
@@ -194,7 +194,7 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644
  	if (wait)
  		sync_inodes_sb(sb);
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 79fec8a8413f..1cb2a1e6d705 100644
+index 79fec8a8413f4..1cb2a1e6d7055 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -1333,6 +1333,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -243,7 +243,7 @@ index 79fec8a8413f..1cb2a1e6d705 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 6e2377e6c1d6..5a945d18a72a 100644
+index 6e2377e6c1d60..5a945d18a72a8 100644
 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
 @@ -325,6 +325,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
@@ -264,7 +264,7 @@ index 6e2377e6c1d6..5a945d18a72a 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 35942084cd40..24f5fd1a789d 100644
+index 35942084cd40d..24f5fd1a789de 100644
 --- a/include/linux/mnt_namespace.h
 +++ b/include/linux/mnt_namespace.h
 @@ -6,11 +6,14 @@
@@ -283,7 +283,7 @@ index 35942084cd40..24f5fd1a789d 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 74b4911ac16d..19789fbea567 100644
+index 74b4911ac16dd..19789fbea5675 100644
 --- a/include/linux/splice.h
 +++ b/include/linux/splice.h
 @@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
@@ -298,7 +298,7 @@ index 74b4911ac16d..19789fbea567 100644
 +			 unsigned int flags);
  #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index dbc936ccf149..ee41ed5d5402 100644
+index dbc936ccf149e..ee41ed5d5402f 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -152,7 +152,7 @@ static

aufs5-kbuild.patch

@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.2.5+ kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
-index bfb1c6095c7a..bddba5bb307e 100644
+index bfb1c6095c7a7..bddba5bb307ed 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 @@ -261,6 +261,7 @@ source "fs/romfs/Kconfig"
@@ -14,7 +14,7 @@ index bfb1c6095c7a..bddba5bb307e 100644
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
-index c9aea23aba56..57c6f47b0185 100644
+index c9aea23aba560..57c6f47b01850 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
 @@ -130,3 +130,4 @@ obj-$(CONFIG_F2FS_FS)		+= f2fs/

aufs5-loopback.patch

@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.2.5+ loopback patch
 
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 1b723737592b..16561a96019c 100644
+index 1b723737592bc..16561a96019cd 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -633,6 +633,15 @@ static inline void loop_update_dio(struct loop_device *lo)
@@ -140,7 +140,7 @@ index 1b723737592b..16561a96019c 100644
  }
  
 diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index af75a5ee4094..1d847cb194ff 100644
+index af75a5ee40944..1d847cb194ff6 100644
 --- a/drivers/block/loop.h
 +++ b/drivers/block/loop.h
 @@ -46,7 +46,7 @@ struct loop_device {
@@ -153,7 +153,7 @@ index af75a5ee4094..1d847cb194ff 100644
  	void		*key_data; 
  
 diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 6fb4a4ed8cc7..ba9a959f2db2 100644
+index 6fb4a4ed8cc7f..ba9a959f2db27 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)
@@ -166,7 +166,7 @@ index 6fb4a4ed8cc7..ba9a959f2db2 100644
  		if (file->f_mapping != h_file->f_mapping) {
  			file->f_mapping = h_file->f_mapping;
 diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
-index a8b63acc6204..9d97c3af5686 100644
+index a8b63acc62045..9d97c3af5686a 100644
 --- a/fs/aufs/loop.c
 +++ b/fs/aufs/loop.c
 @@ -133,3 +133,19 @@ void au_loopback_fin(void)
@@ -190,7 +190,7 @@ index a8b63acc6204..9d97c3af5686 100644
 +	return f;
 +}
 diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index 94f4f80ae33b..ca1194354aff 100644
+index 94f4f80ae33bf..ca1194354aff4 100644
 --- a/fs/aufs/loop.h
 +++ b/fs/aufs/loop.h
 @@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
@@ -212,7 +212,7 @@ index 94f4f80ae33b..ca1194354aff 100644
  
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 589dd0122020..801e0a7faec5 100644
+index 589dd01220201..801e0a7faec59 100644
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
 @@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {
@@ -228,7 +228,7 @@ index 589dd0122020..801e0a7faec5 100644
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 1cb2a1e6d705..33ac1d6cbbfd 100644
+index 1cb2a1e6d7055..33ac1d6cbbfdf 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -1947,6 +1947,10 @@ struct super_operations {

aufs5-mmap.patch

@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.2.5+ mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 03517154fe0f..1000f7e7d5d6 100644
+index 03517154fe0f3..1000f7e7d5d64 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
 @@ -2020,7 +2020,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
@@ -15,7 +15,7 @@ index 03517154fe0f..1000f7e7d5d6 100644
  		rc = 0;
  	}
 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index 14c2badb8fd9..65afe5287e43 100644
+index 14c2badb8fd93..65afe5287e43e 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)
@@ -31,7 +31,7 @@ index 14c2badb8fd9..65afe5287e43 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 7f84d1477b5b..3d9ee997b3d0 100644
+index 7f84d1477b5bd..3d9ee997b3d08 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@@ -56,7 +56,7 @@ index 7f84d1477b5b..3d9ee997b3d0 100644
  	struct mm_walk walk = {
  		.hugetlb_entry = gather_hugetlb_stats,
 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 7907e6419e57..d17209cf52bc 100644
+index 7907e6419e572..d17209cf52bc3 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)
@@ -72,7 +72,7 @@ index 7907e6419e57..d17209cf52bc 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 0a6dae2f2b84..dd74bb1d1f51 100644
+index 0a6dae2f2b844..dd74bb1d1f510 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -1558,6 +1558,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -105,7 +105,7 @@ index 0a6dae2f2b84..dd74bb1d1f51 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 8ec38b11b361..d3f5492a2611 100644
+index 8ec38b11b361e..d3f5492a26115 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
 @@ -253,6 +253,7 @@ struct vm_region {
@@ -125,7 +125,7 @@ index 8ec38b11b361..d3f5492a2611 100644
  
  	atomic_long_t swap_readahead_info;
 diff --git a/kernel/fork.c b/kernel/fork.c
-index fe83343da24b..1ef95aa1dc6e 100644
+index fe83343da24ba..1ef95aa1dc6ef 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -553,7 +553,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -138,7 +138,7 @@ index fe83343da24b..1ef95aa1dc6e 100644
  				atomic_dec(&inode->i_writecount);
  			i_mmap_lock_write(mapping);
 diff --git a/mm/Makefile b/mm/Makefile
-index ac5e5ba78874..5decb22d13a0 100644
+index ac5e5ba788746..5decb22d13a02 100644
 --- a/mm/Makefile
 +++ b/mm/Makefile
 @@ -39,7 +39,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
@@ -151,7 +151,7 @@ index ac5e5ba78874..5decb22d13a0 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 861e26ee4c72..7ac5b439794c 100644
+index 861e26ee4c72c..7ac5b439794c9 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
 @@ -2723,7 +2723,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -164,7 +164,7 @@ index 861e26ee4c72..7ac5b439794c 100644
  	if (page->mapping != inode->i_mapping) {
  		unlock_page(page);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 7e8c3e8ae75f..d8a903f61262 100644
+index 7e8c3e8ae75f1..d8a903f612622 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -182,7 +182,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -261,7 +261,7 @@ index 7e8c3e8ae75f..d8a903f61262 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 b2823519f8cd..d7e4abcaca3e 100644
+index b2823519f8cd2..d7e4abcaca3ef 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
 @@ -640,7 +640,7 @@ static void __put_nommu_region(struct vm_region *region)
@@ -306,7 +306,7 @@ index b2823519f8cd..d7e4abcaca3e 100644
  
 diff --git a/mm/prfile.c b/mm/prfile.c
 new file mode 100644
-index 000000000000..00d51187c325
+index 0000000000000..00d51187c3250
 --- /dev/null
 +++ b/mm/prfile.c
 @@ -0,0 +1,86 @@

aufs5-standalone.patch

@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.2.5+ standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index a688a042d022..3fc74e471924 100644
+index a688a042d0221..3fc74e4719242 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1352,6 +1352,7 @@ void d_walk(struct dentry *parent, void *data,
@@ -22,7 +22,7 @@ index a688a042d022..3fc74e471924 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index 89a500bb897a..1a722915ed77 100644
+index 89a500bb897a6..1a722915ed77d 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -110,6 +110,7 @@ bool path_noexec(const struct path *path)
@@ -34,7 +34,7 @@ index 89a500bb897a..1a722915ed77 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 12dd73930961..0468c845190f 100644
+index 12dd739309616..0468c845190fc 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
@@ -46,7 +46,7 @@ index 12dd73930961..0468c845190f 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 b07b53f24ff5..34b9bbf4c556 100644
+index b07b53f24ff5d..34b9bbf4c5566 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)
@@ -74,7 +74,7 @@ index b07b53f24ff5..34b9bbf4c556 100644
  void __init files_init(void)
  {
 diff --git a/fs/inode.c b/fs/inode.c
-index 9b908c37971f..ed54d3759219 100644
+index 9b908c37971f2..ed54d37592197 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
 @@ -1679,6 +1679,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
@@ -86,7 +86,7 @@ index 9b908c37971f..ed54d3759219 100644
  /**
   *	touch_atime	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 101dda59f39c..6cb11bd6ff9a 100644
+index 101dda59f39c4..6cb11bd6ff9a5 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -436,6 +436,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -114,7 +114,7 @@ index 101dda59f39c..6cb11bd6ff9a 100644
  static void lock_mnt_tree(struct mount *mnt)
  {
 diff --git a/fs/notify/group.c b/fs/notify/group.c
-index 0391190305cc..0b9f7f6d8390 100644
+index 0391190305cc5..0b9f7f6d8390f 100644
 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
 @@ -99,6 +99,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
@@ -142,7 +142,7 @@ index 0391190305cc..0b9f7f6d8390 100644
  int fsnotify_fasync(int fd, struct file *file, int on)
  {
 diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 99ddd126f6f0..2154d69a2c7a 100644
+index 99ddd126f6f0c..2154d69a2c7ad 100644
 --- a/fs/notify/mark.c
 +++ b/fs/notify/mark.c
 @@ -276,6 +276,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
@@ -178,7 +178,7 @@ index 99ddd126f6f0..2154d69a2c7a 100644
  /*
   * Destroy all marks in destroy_list, waits for SRCU period to finish before
 diff --git a/fs/open.c b/fs/open.c
-index a59abe3c669a..78809163ba03 100644
+index a59abe3c669ae..78809163ba039 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,
@@ -190,7 +190,7 @@ index a59abe3c669a..78809163ba03 100644
  long vfs_truncate(const struct path *path, loff_t length)
  {
 diff --git a/fs/read_write.c b/fs/read_write.c
-index afaa864c0315..9ce57246d390 100644
+index afaa864c0315f..9ce57246d3906 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
 @@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
@@ -226,7 +226,7 @@ index afaa864c0315..9ce57246d390 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 58d2692c5f30..4fe4afa7f6b1 100644
+index 58d2692c5f308..4fe4afa7f6b17 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -847,6 +847,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
@@ -246,7 +246,7 @@ index 58d2692c5f30..4fe4afa7f6b1 100644
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/fs/sync.c b/fs/sync.c
-index 457f4e4a5cc1..67c66358f3fe 100644
+index 457f4e4a5cc1f..67c66358f3fe4 100644
 --- a/fs/sync.c
 +++ b/fs/sync.c
 @@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
@@ -258,7 +258,7 @@ index 457f4e4a5cc1..67c66358f3fe 100644
  /*
   * Write out and wait upon all dirty data associated with this
 diff --git a/fs/xattr.c b/fs/xattr.c
-index 90dd78f0eb27..40b01dd1b14a 100644
+index 90dd78f0eb279..40b01dd1b14a2 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,
@@ -270,7 +270,7 @@ index 90dd78f0eb27..40b01dd1b14a 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 ee41ed5d5402..4fc8dc30cec0 100644
+index ee41ed5d5402f..4fc8dc30cec00 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -163,6 +163,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -282,7 +282,7 @@ index ee41ed5d5402..4fc8dc30cec0 100644
  
  #ifdef CONFIG_LOCK_STAT
 diff --git a/kernel/task_work.c b/kernel/task_work.c
-index 0fef395662a6..83fb1ecfc33d 100644
+index 0fef395662a6e..83fb1ecfc33de 100644
 --- a/kernel/task_work.c
 +++ b/kernel/task_work.c
 @@ -116,3 +116,4 @@ void task_work_run(void)
@@ -291,7 +291,7 @@ index 0fef395662a6..83fb1ecfc33d 100644
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index dc28914fa72e..c2ddfea2b280 100644
+index dc28914fa72e0..c2ddfea2b2803 100644
 --- a/security/device_cgroup.c
 +++ b/security/device_cgroup.c
 @@ -824,3 +824,4 @@ int __devcgroup_check_permission(short type, u32 major, u32 minor,
@@ -300,7 +300,7 @@ index dc28914fa72e..c2ddfea2b280 100644
  }
 +EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
 diff --git a/security/security.c b/security/security.c
-index f493db0bf62a..96f118be469f 100644
+index f493db0bf62a9..96f118be469fc 100644
 --- a/security/security.c
 +++ b/security/security.c
 @@ -993,6 +993,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)

include/uapi/linux/aufs_type.h

@@ -40,7 +40,7 @@
 #include <limits.h>
 #endif /* __KERNEL__ */
 
-#define AUFS_VERSION	"5.2.5+-20200518"
+#define AUFS_VERSION	"5.2.5+-20200622"
 
 /* todo? move this to linux-2.6.19/include/magic.h */
 #define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

lockdep-debug.patch

@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.2.5+ lockdep patch
 
 diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index 5a945d18a72a..c6def416ec11 100644
+index 5a945d18a72a8..c6def416ec115 100644
 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
 @@ -17,7 +17,7 @@ struct lockdep_map;
@@ -15,11 +15,11 @@ index 5a945d18a72a..c6def416ec11 100644
  #include <linux/types.h>
  
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 4fc8dc30cec0..16af3f1e7656 100644
+index 4fc8dc30cec00..16af3f1e76565 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
-index 150ec3f0c5b5..e65c1d0b1ac1 100644
+index 150ec3f0c5b5d..e65c1d0b1ac1e 100644
 --- a/kernel/locking/lockdep_internals.h
 +++ b/kernel/locking/lockdep_internals.h
 @@ -93,15 +93,15 @@ static const unsigned long LOCKF_USED_IN_IRQ_READ =