diff --git a/debian/changelog b/debian/changelog
index 98b2665ef..069aa0cde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1247,6 +1247,8 @@ linux (4.19.97-1) UNRELEASED; urgency=medium
   * [rt] Update to 4.19.94-rt38:
     - Refresh "x86/ioapic: Don't let setaffinity unmask threaded EOI interrupt
       too early" which was partly included in 4.19.92
+  * aufs: Update support patchset to aufs4.19.63+ 20200113; no functional
+    changes
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 14 Dec 2019 22:00:16 +0100
 
diff --git a/debian/patches/features/all/aufs4/aufs4-base.patch b/debian/patches/features/all/aufs4/aufs4-base.patch
index 843a0d685..c0e036a73 100644
--- a/debian/patches/features/all/aufs4/aufs4-base.patch
+++ b/debian/patches/features/all/aufs4/aufs4-base.patch
@@ -1,26 +1,26 @@
 From: J. R. Okajima <hooanon05@yahoo.co.jp>
-Date: Sat Sep 8 23:32:19 2018 +0900
-Subject: aufs4.x-rcN base patch
-Origin: https://github.com/sfjro/aufs4-standalone/tree/ecea3973efed5223878e489d212dc39fee4dabb6
+Date: Tue Sep 3 14:14:09 2019 +0900
+Subject: aufs4.19.63+ base patch
+Origin: https://github.com/sfjro/aufs4-standalone/tree/6c582cc629cbfb4fac5bfc7d20db128c7d201da6
 Bug-Debian: https://bugs.debian.org/541828
 
-Patch headers added by debian/patches/features/all/aufs4/gen-patch
+Patch headers added by debian/bin/genpatch-aufs
 
 SPDX-License-Identifier: GPL-2.0
-aufs4.x-rcN base patch
+aufs4.19.63+ base patch
 
-Index: linux/MAINTAINERS
-===================================================================
---- linux.orig/MAINTAINERS
-+++ linux/MAINTAINERS
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 11a59e82d92e..573d5b42b28b 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
 @@ -2605,6 +2605,19 @@ F:	include/linux/audit.h
  F:	include/uapi/linux/audit.h
  F:	kernel/audit*
  
 +AUFS (advanced multi layered unification filesystem) FILESYSTEM
 +M:	"J. R. Okajima" <hooanon05g@gmail.com>
-+L:	linux-unionfs@vger.kernel.org
 +L:	aufs-users@lists.sourceforge.net (members only)
++L:	linux-unionfs@vger.kernel.org
 +W:	http://aufs.sourceforge.net
 +T:	git://github.com/sfjro/aufs4-linux.git
 +S:	Supported
@@ -33,11 +33,11 @@ Index: linux/MAINTAINERS
  AUXILIARY DISPLAY DRIVERS
  M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
  S:	Maintained
-Index: linux/drivers/block/loop.c
-===================================================================
---- linux.orig/drivers/block/loop.c
-+++ linux/drivers/block/loop.c
-@@ -739,6 +739,24 @@ out_err:
+diff --git a/drivers/block/loop.c b/drivers/block/loop.c
+index f1e63eb7cbca..b732df5f14f3 100644
+--- a/drivers/block/loop.c
++++ b/drivers/block/loop.c
+@@ -739,6 +739,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	return error;
  }
  
@@ -62,10 +62,10 @@ Index: linux/drivers/block/loop.c
  /* loop sysfs attributes */
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
-Index: linux/fs/dcache.c
-===================================================================
---- linux.orig/fs/dcache.c
-+++ linux/fs/dcache.c
+diff --git a/fs/dcache.c b/fs/dcache.c
+index 6e0022326afe..3bd53094ac3d 100644
+--- a/fs/dcache.c
++++ b/fs/dcache.c
 @@ -1234,7 +1234,7 @@ enum d_walk_ret {
   *
   * The @enter() callbacks are called with d_lock held.
@@ -75,10 +75,10 @@ Index: linux/fs/dcache.c
  		   enum d_walk_ret (*enter)(void *, struct dentry *))
  {
  	struct dentry *this_parent;
-Index: linux/fs/fcntl.c
-===================================================================
---- linux.orig/fs/fcntl.c
-+++ linux/fs/fcntl.c
+diff --git a/fs/fcntl.c b/fs/fcntl.c
+index 4137d96534a6..c91b3e3c4580 100644
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
 @@ -32,7 +32,7 @@
  
  #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
@@ -88,7 +88,7 @@ Index: linux/fs/fcntl.c
  {
  	struct inode * inode = file_inode(filp);
  	int error = 0;
-@@ -63,6 +63,8 @@ static int setfl(int fd, struct file * f
+@@ -63,6 +63,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg)
  
  	if (filp->f_op->check_flags)
  		error = filp->f_op->check_flags(arg);
@@ -97,10 +97,10 @@ Index: linux/fs/fcntl.c
  	if (error)
  		return error;
  
-Index: linux/fs/inode.c
-===================================================================
---- linux.orig/fs/inode.c
-+++ linux/fs/inode.c
+diff --git a/fs/inode.c b/fs/inode.c
+index 5c63693326bb..43046d7223e4 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
 @@ -1657,7 +1657,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.
@@ -110,11 +110,11 @@ Index: linux/fs/inode.c
  {
  	int (*update_time)(struct inode *, struct timespec64 *, int);
  
-Index: linux/fs/namespace.c
-===================================================================
---- linux.orig/fs/namespace.c
-+++ linux/fs/namespace.c
-@@ -770,6 +770,12 @@ static inline int check_mnt(struct mount
+diff --git a/fs/namespace.c b/fs/namespace.c
+index 1fce41ba3535..fbd7edd49a2f 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
  	return mnt->mnt_ns == current->nsproxy->mnt_ns;
  }
  
@@ -127,11 +127,11 @@ Index: linux/fs/namespace.c
  /*
   * vfsmount lock must be held for write
   */
-Index: linux/fs/read_write.c
-===================================================================
---- linux.orig/fs/read_write.c
-+++ linux/fs/read_write.c
-@@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, c
+diff --git a/fs/read_write.c b/fs/read_write.c
+index 85fd7a8ee29e..c1335b4f19c0 100644
+--- a/fs/read_write.c
++++ b/fs/read_write.c
+@@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
  		return -EINVAL;
  }
  
@@ -160,10 +160,10 @@ Index: linux/fs/read_write.c
  ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
  {
  	mm_segment_t old_fs;
-Index: linux/fs/splice.c
-===================================================================
---- linux.orig/fs/splice.c
-+++ linux/fs/splice.c
+diff --git a/fs/splice.c b/fs/splice.c
+index 485e409ef841..b2c2d320565b 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
 @@ -838,8 +838,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
@@ -175,7 +175,7 @@ Index: linux/fs/splice.c
  {
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
  				loff_t *, size_t, unsigned int);
-@@ -855,9 +855,9 @@ static long do_splice_from(struct pipe_i
+@@ -855,9 +855,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.
   */
@@ -188,10 +188,10 @@ Index: linux/fs/splice.c
  {
  	ssize_t (*splice_read)(struct file *, loff_t *,
  			       struct pipe_inode_info *, size_t, unsigned int);
-Index: linux/fs/sync.c
-===================================================================
---- linux.orig/fs/sync.c
-+++ linux/fs/sync.c
+diff --git a/fs/sync.c b/fs/sync.c
+index b54e0541ad89..28607828e96f 100644
+--- a/fs/sync.c
++++ b/fs/sync.c
 @@ -28,7 +28,7 @@
   * wait == 1 case since in that case write_inode() functions do
   * sync_dirty_buffer() and thus effectively write one block at a time.
@@ -201,11 +201,11 @@ Index: linux/fs/sync.c
  {
  	if (wait)
  		sync_inodes_sb(sb);
-Index: linux/include/linux/fs.h
-===================================================================
---- linux.orig/include/linux/fs.h
-+++ linux/include/linux/fs.h
-@@ -1295,6 +1295,7 @@ extern void fasync_free(struct fasync_st
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 92420009b9bc..ecad33c40cae 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -1295,6 +1295,7 @@ extern void fasync_free(struct fasync_struct *);
  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  
@@ -221,7 +221,7 @@ Index: linux/include/linux/fs.h
  	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);
-@@ -1830,6 +1832,12 @@ ssize_t rw_copy_check_uvector(int type,
+@@ -1830,6 +1832,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
  			      struct iovec *fast_pointer,
  			      struct iovec **ret_pointer);
  
@@ -242,7 +242,7 @@ Index: linux/include/linux/fs.h
  
  /* /sys/fs */
  extern struct kobject *fs_kobj;
-@@ -2542,6 +2551,7 @@ static inline bool sb_is_blkdev_sb(struc
+@@ -2542,6 +2551,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
  	return false;
  }
  #endif
@@ -250,11 +250,11 @@ Index: linux/include/linux/fs.h
  extern int sync_filesystem(struct super_block *);
  extern const struct file_operations def_blk_fops;
  extern const struct file_operations def_chr_fops;
-Index: linux/include/linux/lockdep.h
-===================================================================
---- linux.orig/include/linux/lockdep.h
-+++ linux/include/linux/lockdep.h
-@@ -313,6 +313,8 @@ static inline int lockdep_match_key(stru
+diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
+index b0d0b51c4d85..f73ffaa0199e 100644
+--- a/include/linux/lockdep.h
++++ b/include/linux/lockdep.h
+@@ -313,6 +313,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
  	return lock->key == key;
  }
  
@@ -271,10 +271,10 @@ Index: linux/include/linux/lockdep.h
  #define lockdep_is_held_type(l, r)		(1)
  
  #define lockdep_assert_held(l)			do { (void)(l); } while (0)
-Index: linux/include/linux/mnt_namespace.h
-===================================================================
---- linux.orig/include/linux/mnt_namespace.h
-+++ linux/include/linux/mnt_namespace.h
+diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
+index 35942084cd40..24f5fd1a789d 100644
+--- a/include/linux/mnt_namespace.h
++++ b/include/linux/mnt_namespace.h
 @@ -6,11 +6,14 @@
  struct mnt_namespace;
  struct fs_struct;
@@ -290,11 +290,11 @@ Index: linux/include/linux/mnt_namespace.h
  extern const struct file_operations proc_mounts_operations;
  extern const struct file_operations proc_mountinfo_operations;
  extern const struct file_operations proc_mountstats_operations;
-Index: linux/include/linux/splice.h
-===================================================================
---- linux.orig/include/linux/splice.h
-+++ linux/include/linux/splice.h
-@@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct spl
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 74b4911ac16d..19789fbea567 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -87,4 +87,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;
@@ -305,11 +305,11 @@ Index: linux/include/linux/splice.h
 +			 struct pipe_inode_info *pipe, size_t len,
 +			 unsigned int flags);
  #endif
-Index: linux/kernel/locking/lockdep.c
-===================================================================
---- linux.orig/kernel/locking/lockdep.c
-+++ linux/kernel/locking/lockdep.c
-@@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX
+diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
+index e810e8cb17e1..d0c9931e6531 100644
+--- a/kernel/locking/lockdep.c
++++ b/kernel/locking/lockdep.c
+@@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
  unsigned long nr_lock_classes;
  static struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
  
@@ -318,7 +318,7 @@ Index: linux/kernel/locking/lockdep.c
  {
  	if (!hlock->class_idx) {
  		/*
-@@ -151,6 +151,7 @@ static inline struct lock_class *hlock_c
+@@ -151,6 +151,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
  	}
  	return lock_classes + hlock->class_idx - 1;
  }
diff --git a/debian/patches/features/all/aufs4/aufs4-mmap.patch b/debian/patches/features/all/aufs4/aufs4-mmap.patch
index e3a6589ee..98fe007a8 100644
--- a/debian/patches/features/all/aufs4/aufs4-mmap.patch
+++ b/debian/patches/features/all/aufs4/aufs4-mmap.patch
@@ -1,19 +1,19 @@
 From: J. R. Okajima <hooanon05@yahoo.co.jp>
-Date: Sat Sep 8 23:32:19 2018 +0900
-Subject: aufs4.x-rcN mmap patch
-Origin: https://github.com/sfjro/aufs4-standalone/tree/ecea3973efed5223878e489d212dc39fee4dabb6
+Date: Tue Sep 3 14:14:09 2019 +0900
+Subject: aufs4.19.63+ mmap patch
+Origin: https://github.com/sfjro/aufs4-standalone/tree/6c582cc629cbfb4fac5bfc7d20db128c7d201da6
 Bug-Debian: https://bugs.debian.org/541828
 
-Patch headers added by debian/patches/features/all/aufs4/gen-patch
+Patch headers added by debian/bin/genpatch-aufs
 
 SPDX-License-Identifier: GPL-2.0
-aufs4.x-rcN mmap patch
+aufs4.19.63+ mmap patch
 
-Index: linux/fs/proc/base.c
-===================================================================
---- linux.orig/fs/proc/base.c
-+++ linux/fs/proc/base.c
-@@ -2036,7 +2036,7 @@ static int map_files_get_link(struct den
+diff --git a/fs/proc/base.c b/fs/proc/base.c
+index a7fbda72afeb..9c8439a01c5b 100644
+--- a/fs/proc/base.c
++++ b/fs/proc/base.c
+@@ -2018,7 +2018,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) {
@@ -22,11 +22,11 @@ Index: linux/fs/proc/base.c
  		path_get(path);
  		rc = 0;
  	}
-Index: linux/fs/proc/nommu.c
-===================================================================
---- linux.orig/fs/proc/nommu.c
-+++ linux/fs/proc/nommu.c
-@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_
+diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
+index 3b63be64e436..fb9913bf3d10 100644
+--- a/fs/proc/nommu.c
++++ b/fs/proc/nommu.c
+@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
  	file = region->vm_file;
  
  	if (file) {
@@ -38,11 +38,11 @@ Index: linux/fs/proc/nommu.c
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  	}
-Index: linux/fs/proc/task_mmu.c
-===================================================================
---- linux.orig/fs/proc/task_mmu.c
-+++ linux/fs/proc/task_mmu.c
-@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct
+diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
+index 71aba44c4fa6..87cdce66a3f4 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)
  	const char *name = NULL;
  
  	if (file) {
@@ -54,7 +54,7 @@ Index: linux/fs/proc/task_mmu.c
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1766,7 +1769,7 @@ static int show_numa_map(struct seq_file
+@@ -1766,7 +1769,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;
@@ -63,11 +63,11 @@ Index: linux/fs/proc/task_mmu.c
  	struct mm_struct *mm = vma->vm_mm;
  	struct mm_walk walk = {
  		.hugetlb_entry = gather_hugetlb_stats,
-Index: linux/fs/proc/task_nommu.c
-===================================================================
---- linux.orig/fs/proc/task_nommu.c
-+++ linux/fs/proc/task_nommu.c
-@@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_fil
+diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
+index 5161894a6d62..b6d13cce45f3 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)
  	file = vma->vm_file;
  
  	if (file) {
@@ -79,11 +79,11 @@ Index: linux/fs/proc/task_nommu.c
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
-Index: linux/include/linux/mm.h
-===================================================================
---- linux.orig/include/linux/mm.h
-+++ linux/include/linux/mm.h
-@@ -1453,6 +1453,28 @@ static inline void unmap_shared_mapping_
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index bdec425c8e14..88cb95dc57dd 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -1453,6 +1453,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
  	unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  
@@ -112,10 +112,10 @@ Index: linux/include/linux/mm.h
  extern int access_process_vm(struct task_struct *tsk, unsigned long addr,
  		void *buf, int len, unsigned int gup_flags);
  extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
-Index: linux/include/linux/mm_types.h
-===================================================================
---- linux.orig/include/linux/mm_types.h
-+++ linux/include/linux/mm_types.h
+diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
+index 5ed8f6292a53..01229754077f 100644
+--- a/include/linux/mm_types.h
++++ b/include/linux/mm_types.h
 @@ -239,6 +239,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 */
@@ -132,11 +132,11 @@ Index: linux/include/linux/mm_types.h
  	void * vm_private_data;		/* was vm_pte (shared mem) */
  
  	atomic_long_t swap_readahead_info;
-Index: linux/kernel/fork.c
-===================================================================
---- linux.orig/kernel/fork.c
-+++ linux/kernel/fork.c
-@@ -505,7 +505,7 @@ static __latent_entropy int dup_mmap(str
+diff --git a/kernel/fork.c b/kernel/fork.c
+index 69874db3fba8..757620e64e7b 100644
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -505,7 +505,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
  			struct inode *inode = file_inode(file);
  			struct address_space *mapping = file->f_mapping;
  
@@ -145,11 +145,11 @@ Index: linux/kernel/fork.c
  			if (tmp->vm_flags & VM_DENYWRITE)
  				atomic_dec(&inode->i_writecount);
  			i_mmap_lock_write(mapping);
-Index: linux/mm/Makefile
-===================================================================
---- linux.orig/mm/Makefile
-+++ linux/mm/Makefile
-@@ -39,7 +39,7 @@ obj-y			:= filemap.o mempool.o oom_kill.
+diff --git a/mm/Makefile b/mm/Makefile
+index 26ef77a3883b..b2869af1ef08 100644
+--- a/mm/Makefile
++++ b/mm/Makefile
+@@ -39,7 +39,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
  			   mm_init.o mmu_context.o percpu.o slab_common.o \
  			   compaction.o vmacache.o \
  			   interval_tree.o list_lru.o workingset.o \
@@ -158,11 +158,11 @@ Index: linux/mm/Makefile
  
  obj-y += init-mm.o
  
-Index: linux/mm/filemap.c
-===================================================================
---- linux.orig/mm/filemap.c
-+++ linux/mm/filemap.c
-@@ -2722,7 +2722,7 @@ vm_fault_t filemap_page_mkwrite(struct v
+diff --git a/mm/filemap.c b/mm/filemap.c
+index 287f3fa02e5e..f96b6dd07b0b 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -2722,7 +2722,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
  	vm_fault_t ret = VM_FAULT_LOCKED;
  
  	sb_start_pagefault(inode->i_sb);
@@ -171,11 +171,11 @@ Index: linux/mm/filemap.c
  	lock_page(page);
  	if (page->mapping != inode->i_mapping) {
  		unlock_page(page);
-Index: linux/mm/mmap.c
-===================================================================
---- linux.orig/mm/mmap.c
-+++ linux/mm/mmap.c
-@@ -181,7 +181,7 @@ static struct vm_area_struct *remove_vma
+diff --git a/mm/mmap.c b/mm/mmap.c
+index 1480880ff814..03ae15dfe614 100644
+--- a/mm/mmap.c
++++ b/mm/mmap.c
+@@ -181,7 +181,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
@@ -184,7 +184,7 @@ Index: linux/mm/mmap.c
  	mpol_put(vma_policy(vma));
  	vm_area_free(vma);
  	return next;
-@@ -906,7 +906,7 @@ again:
+@@ -906,7 +906,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);
@@ -193,7 +193,7 @@ Index: linux/mm/mmap.c
  		}
  		if (next->anon_vma)
  			anon_vma_merge(vma, next);
-@@ -1822,8 +1822,8 @@ out:
+@@ -1822,8 +1822,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  	return addr;
  
  unmap_and_free_vma:
@@ -203,7 +203,7 @@ Index: linux/mm/mmap.c
  
  	/* Undo any partial mapping done by a device driver. */
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2645,7 +2645,7 @@ int __split_vma(struct mm_struct *mm, st
+@@ -2645,7 +2645,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  		goto out_free_mpol;
  
  	if (new->vm_file)
@@ -212,7 +212,7 @@ Index: linux/mm/mmap.c
  
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
-@@ -2664,7 +2664,7 @@ int __split_vma(struct mm_struct *mm, st
+@@ -2664,7 +2664,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)
@@ -221,7 +221,7 @@ Index: linux/mm/mmap.c
  	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
-@@ -2826,7 +2826,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
+@@ -2826,7 +2826,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;
@@ -230,7 +230,7 @@ Index: linux/mm/mmap.c
  
  	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
  		     current->comm, current->pid);
-@@ -2901,10 +2901,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
+@@ -2901,10 +2901,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  		}
  	}
  
@@ -259,7 +259,7 @@ Index: linux/mm/mmap.c
  out:
  	up_write(&mm->mmap_sem);
  	if (populate)
-@@ -3210,7 +3227,7 @@ struct vm_area_struct *copy_vma(struct v
+@@ -3210,7 +3227,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)
@@ -268,11 +268,11 @@ Index: linux/mm/mmap.c
  		if (new_vma->vm_ops && new_vma->vm_ops->open)
  			new_vma->vm_ops->open(new_vma);
  		vma_link(mm, new_vma, prev, rb_link, rb_parent);
-Index: linux/mm/nommu.c
-===================================================================
---- linux.orig/mm/nommu.c
-+++ linux/mm/nommu.c
-@@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm
+diff --git a/mm/nommu.c b/mm/nommu.c
+index 1d63ecfc98c5..15eafddeb944 100644
+--- a/mm/nommu.c
++++ b/mm/nommu.c
+@@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm_region *region)
  		up_write(&nommu_region_sem);
  
  		if (region->vm_file)
@@ -281,7 +281,7 @@ Index: linux/mm/nommu.c
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -763,7 +763,7 @@ static void delete_vma(struct mm_struct
+@@ -763,7 +763,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)
@@ -299,7 +299,7 @@ Index: linux/mm/nommu.c
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1361,7 +1361,7 @@ error_just_free:
+@@ -1361,10 +1361,10 @@ unsigned long do_mmap(struct file *file,
  	up_write(&nommu_region_sem);
  error:
  	if (region->vm_file)
@@ -307,11 +307,16 @@ Index: linux/mm/nommu.c
 +		vmr_fput(region);
  	kmem_cache_free(vm_region_jar, region);
  	if (vma->vm_file)
- 		fput(vma->vm_file);
-Index: linux/mm/prfile.c
-===================================================================
+-		fput(vma->vm_file);
++		vma_fput(vma);
+ 	vm_area_free(vma);
+ 	return ret;
+ 
+diff --git a/mm/prfile.c b/mm/prfile.c
+new file mode 100644
+index 000000000000..024cdcfae1b1
 --- /dev/null
-+++ linux/mm/prfile.c
++++ b/mm/prfile.c
 @@ -0,0 +1,86 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -321,7 +326,7 @@ Index: linux/mm/prfile.c
 + *
 + * See Documentation/filesystems/aufs/design/06mmap.txt
 + *
-+ * Copyright (c) 2014-2018 Junjro R. Okajima
++ * Copyright (c) 2014-2019 Junjro R. Okajima
 + * Copyright (c) 2014 Ian Campbell
 + */
 +
diff --git a/debian/patches/features/all/aufs4/aufs4-standalone.patch b/debian/patches/features/all/aufs4/aufs4-standalone.patch
index 745480de4..0a682c2f5 100644
--- a/debian/patches/features/all/aufs4/aufs4-standalone.patch
+++ b/debian/patches/features/all/aufs4/aufs4-standalone.patch
@@ -1,19 +1,19 @@
 From: J. R. Okajima <hooanon05@yahoo.co.jp>
-Date: Sat Sep 8 23:32:19 2018 +0900
-Subject: aufs4.x-rcN standalone patch
-Origin: https://github.com/sfjro/aufs4-standalone/tree/ecea3973efed5223878e489d212dc39fee4dabb6
+Date: Tue Sep 3 14:14:09 2019 +0900
+Subject: aufs4.19.63+ standalone patch
+Origin: https://github.com/sfjro/aufs4-standalone/tree/6c582cc629cbfb4fac5bfc7d20db128c7d201da6
 Bug-Debian: https://bugs.debian.org/541828
 
-Patch headers added by debian/patches/features/all/aufs4/gen-patch
+Patch headers added by debian/bin/genpatch-aufs
 
 SPDX-License-Identifier: GPL-2.0
-aufs4.x-rcN standalone patch
+aufs4.19.63+ standalone patch
 
-Index: linux/fs/dcache.c
-===================================================================
---- linux.orig/fs/dcache.c
-+++ linux/fs/dcache.c
-@@ -1339,6 +1339,7 @@ rename_retry:
+diff --git a/fs/dcache.c b/fs/dcache.c
+index 3bd53094ac3d..d6b2f7a994f4 100644
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -1339,6 +1339,7 @@ void d_walk(struct dentry *parent, void *data,
  	seq = 1;
  	goto again;
  }
@@ -21,7 +21,7 @@ Index: linux/fs/dcache.c
  
  struct check_mount {
  	struct vfsmount *mnt;
-@@ -2835,6 +2836,7 @@ void d_exchange(struct dentry *dentry1,
+@@ -2835,6 +2836,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
  
  	write_sequnlock(&rename_lock);
  }
@@ -29,11 +29,11 @@ Index: linux/fs/dcache.c
  
  /**
   * d_ancestor - search for an ancestor
-Index: linux/fs/exec.c
-===================================================================
---- linux.orig/fs/exec.c
-+++ linux/fs/exec.c
-@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path
+diff --git a/fs/exec.c b/fs/exec.c
+index 433b1257694a..504c56308700 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
  	return (path->mnt->mnt_flags & MNT_NOEXEC) ||
  	       (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
  }
@@ -41,11 +41,11 @@ Index: linux/fs/exec.c
  
  #ifdef CONFIG_USELIB
  /*
-Index: linux/fs/fcntl.c
-===================================================================
---- linux.orig/fs/fcntl.c
-+++ linux/fs/fcntl.c
-@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, un
+diff --git a/fs/fcntl.c b/fs/fcntl.c
+index c91b3e3c4580..77513097f04c 100644
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
   out:
  	return error;
  }
@@ -53,11 +53,11 @@ Index: linux/fs/fcntl.c
  
  static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
                       int force)
-Index: linux/fs/file_table.c
-===================================================================
---- linux.orig/fs/file_table.c
-+++ linux/fs/file_table.c
-@@ -161,6 +161,7 @@ over:
+diff --git a/fs/file_table.c b/fs/file_table.c
+index e49af4caf15d..569020fd1fb3 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
  	}
  	return ERR_PTR(-ENFILE);
  }
@@ -81,11 +81,11 @@ Index: linux/fs/file_table.c
  
  void __init files_init(void)
  {
-Index: linux/fs/inode.c
-===================================================================
---- linux.orig/fs/inode.c
-+++ linux/fs/inode.c
-@@ -1666,6 +1666,7 @@ int update_time(struct inode *inode, str
+diff --git a/fs/inode.c b/fs/inode.c
+index 43046d7223e4..36146c757aa2 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -1666,6 +1666,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
  
  	return update_time(inode, time, flags);
  }
@@ -93,11 +93,11 @@ Index: linux/fs/inode.c
  
  /**
   *	touch_atime	-	update the access time
-Index: linux/fs/namespace.c
-===================================================================
---- linux.orig/fs/namespace.c
-+++ linux/fs/namespace.c
-@@ -437,6 +437,7 @@ void __mnt_drop_write(struct vfsmount *m
+diff --git a/fs/namespace.c b/fs/namespace.c
+index fbd7edd49a2f..d6eca814d9fc 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -437,6 +437,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
  	mnt_dec_writers(real_mount(mnt));
  	preempt_enable();
  }
@@ -105,7 +105,7 @@ Index: linux/fs/namespace.c
  
  /**
   * mnt_drop_write - give up write access to a mount
-@@ -775,6 +776,7 @@ int is_current_mnt_ns(struct vfsmount *m
+@@ -775,6 +776,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
  {
  	return check_mnt(real_mount(mnt));
  }
@@ -113,7 +113,7 @@ Index: linux/fs/namespace.c
  
  /*
   * vfsmount lock must be held for write
-@@ -1844,6 +1846,7 @@ int iterate_mounts(int (*f)(struct vfsmo
+@@ -1844,6 +1846,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -121,19 +121,11 @@ Index: linux/fs/namespace.c
  
  static void cleanup_group_ids(struct mount *mnt, struct mount *end)
  {
-Index: linux/fs/notify/group.c
-===================================================================
---- linux.orig/fs/notify/group.c
-+++ linux/fs/notify/group.c
-@@ -23,6 +23,7 @@
- #include <linux/rculist.h>
- #include <linux/wait.h>
- #include <linux/memcontrol.h>
-+#include <linux/module.h>
- 
- #include <linux/fsnotify_backend.h>
- #include "fsnotify.h"
-@@ -112,6 +113,7 @@ void fsnotify_get_group(struct fsnotify_
+diff --git a/fs/notify/group.c b/fs/notify/group.c
+index c03b83662876..94d210ca384a 100644
+--- a/fs/notify/group.c
++++ b/fs/notify/group.c
+@@ -112,6 +112,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
  {
  	refcount_inc(&group->refcnt);
  }
@@ -141,7 +133,7 @@ Index: linux/fs/notify/group.c
  
  /*
   * Drop a reference to a group.  Free it if it's through.
-@@ -121,6 +123,7 @@ void fsnotify_put_group(struct fsnotify_
+@@ -121,6 +122,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
  	if (refcount_dec_and_test(&group->refcnt))
  		fsnotify_final_destroy_group(group);
  }
@@ -149,7 +141,7 @@ Index: linux/fs/notify/group.c
  
  /*
   * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -150,6 +153,7 @@ struct fsnotify_group *fsnotify_alloc_gr
+@@ -150,6 +152,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
  
  	return group;
  }
@@ -157,11 +149,11 @@ Index: linux/fs/notify/group.c
  
  int fsnotify_fasync(int fd, struct file *file, int on)
  {
-Index: linux/fs/notify/mark.c
-===================================================================
---- linux.orig/fs/notify/mark.c
-+++ linux/fs/notify/mark.c
-@@ -285,6 +285,7 @@ void fsnotify_put_mark(struct fsnotify_m
+diff --git a/fs/notify/mark.c b/fs/notify/mark.c
+index 09535f6423fc..e9401ec71fc7 100644
+--- a/fs/notify/mark.c
++++ b/fs/notify/mark.c
+@@ -285,6 +285,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
  	queue_delayed_work(system_unbound_wq, &reaper_work,
  			   FSNOTIFY_REAPER_DELAY);
  }
@@ -169,7 +161,7 @@ Index: linux/fs/notify/mark.c
  
  /*
   * Get mark reference when we found the mark via lockless traversal of object
-@@ -439,6 +440,7 @@ void fsnotify_destroy_mark(struct fsnoti
+@@ -439,6 +440,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
  	mutex_unlock(&group->mark_mutex);
  	fsnotify_free_mark(mark);
  }
@@ -177,7 +169,7 @@ Index: linux/fs/notify/mark.c
  
  /*
   * Sorting function for lists of fsnotify marks.
-@@ -654,6 +656,7 @@ int fsnotify_add_mark(struct fsnotify_ma
+@@ -654,6 +656,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp,
  	mutex_unlock(&group->mark_mutex);
  	return ret;
  }
@@ -185,7 +177,7 @@ Index: linux/fs/notify/mark.c
  
  /*
   * Given a list of marks, find the mark associated with given group. If found
-@@ -777,6 +780,7 @@ void fsnotify_init_mark(struct fsnotify_
+@@ -777,6 +780,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
  	fsnotify_get_group(group);
  	mark->group = group;
  }
@@ -193,11 +185,11 @@ Index: linux/fs/notify/mark.c
  
  /*
   * Destroy all marks in destroy_list, waits for SRCU period to finish before
-Index: linux/fs/open.c
-===================================================================
---- linux.orig/fs/open.c
-+++ linux/fs/open.c
-@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, l
+diff --git a/fs/open.c b/fs/open.c
+index 878478745924..ab755f585f29 100644
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
  	inode_unlock(dentry->d_inode);
  	return ret;
  }
@@ -205,11 +197,11 @@ Index: linux/fs/open.c
  
  long vfs_truncate(const struct path *path, loff_t length)
  {
-Index: linux/fs/read_write.c
-===================================================================
---- linux.orig/fs/read_write.c
-+++ linux/fs/read_write.c
-@@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char
+diff --git a/fs/read_write.c b/fs/read_write.c
+index c1335b4f19c0..6ed1f2ddcb03 100644
+--- a/fs/read_write.c
++++ b/fs/read_write.c
+@@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
  
  	return ret;
  }
@@ -225,7 +217,7 @@ Index: linux/fs/read_write.c
  
  vfs_writef_t vfs_writef(struct file *file)
  {
-@@ -510,6 +512,7 @@ vfs_writef_t vfs_writef(struct file *fil
+@@ -510,6 +512,7 @@ vfs_writef_t vfs_writef(struct file *file)
  		return new_sync_write;
  	return ERR_PTR(-ENOSYS);
  }
@@ -233,7 +225,7 @@ Index: linux/fs/read_write.c
  
  ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
  {
-@@ -579,6 +582,7 @@ ssize_t vfs_write(struct file *file, con
+@@ -579,6 +582,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
  
  	return ret;
  }
@@ -241,11 +233,11 @@ Index: linux/fs/read_write.c
  
  static inline loff_t file_pos_read(struct file *file)
  {
-Index: linux/fs/splice.c
-===================================================================
---- linux.orig/fs/splice.c
-+++ linux/fs/splice.c
-@@ -851,6 +851,7 @@ long do_splice_from(struct pipe_inode_in
+diff --git a/fs/splice.c b/fs/splice.c
+index b2c2d320565b..8250f2366329 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -851,6 +851,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -253,7 +245,7 @@ Index: linux/fs/splice.c
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -880,6 +881,7 @@ long do_splice_to(struct file *in, loff_
+@@ -880,6 +881,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -261,11 +253,11 @@ Index: linux/fs/splice.c
  
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
-Index: linux/fs/sync.c
-===================================================================
---- linux.orig/fs/sync.c
-+++ linux/fs/sync.c
-@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block
+diff --git a/fs/sync.c b/fs/sync.c
+index 28607828e96f..ffd7ea43831e 100644
+--- a/fs/sync.c
++++ b/fs/sync.c
+@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
  		sb->s_op->sync_fs(sb, wait);
  	return __sync_blockdev(sb->s_bdev, wait);
  }
@@ -273,11 +265,11 @@ Index: linux/fs/sync.c
  
  /*
   * Write out and wait upon all dirty data associated with this
-Index: linux/fs/xattr.c
-===================================================================
---- linux.orig/fs/xattr.c
-+++ linux/fs/xattr.c
-@@ -295,6 +295,7 @@ vfs_getxattr_alloc(struct dentry *dentry
+diff --git a/fs/xattr.c b/fs/xattr.c
+index 0d6a6a4af861..7ce4701b7289 100644
+--- a/fs/xattr.c
++++ b/fs/xattr.c
+@@ -295,6 +295,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
  	*xattr_value = value;
  	return error;
  }
@@ -285,11 +277,11 @@ Index: linux/fs/xattr.c
  
  ssize_t
  __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
-Index: linux/kernel/locking/lockdep.c
-===================================================================
---- linux.orig/kernel/locking/lockdep.c
-+++ linux/kernel/locking/lockdep.c
-@@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_
+diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
+index d0c9931e6531..0e5d9706723c 100644
+--- a/kernel/locking/lockdep.c
++++ b/kernel/locking/lockdep.c
+@@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
  	}
  	return lock_classes + hlock->class_idx - 1;
  }
@@ -297,56 +289,29 @@ Index: linux/kernel/locking/lockdep.c
  #define hlock_class(hlock) lockdep_hlock_class(hlock)
  
  #ifdef CONFIG_LOCK_STAT
-Index: linux/kernel/task_work.c
-===================================================================
---- linux.orig/kernel/task_work.c
-+++ linux/kernel/task_work.c
+diff --git a/kernel/task_work.c b/kernel/task_work.c
+index 0fef395662a6..83fb1ecfc33d 100644
+--- a/kernel/task_work.c
++++ b/kernel/task_work.c
 @@ -116,3 +116,4 @@ void task_work_run(void)
  		} while (work);
  	}
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
-Index: linux/security/commoncap.c
-===================================================================
---- linux.orig/security/commoncap.c
-+++ linux/security/commoncap.c
-@@ -1336,12 +1336,14 @@ int cap_mmap_addr(unsigned long addr)
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL_GPL(cap_mmap_addr);
- 
- int cap_mmap_file(struct file *file, unsigned long reqprot,
- 		  unsigned long prot, unsigned long flags)
- {
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(cap_mmap_file);
- 
- #ifdef CONFIG_SECURITY
- 
-Index: linux/security/device_cgroup.c
-===================================================================
---- linux.orig/security/device_cgroup.c
-+++ linux/security/device_cgroup.c
-@@ -8,6 +8,7 @@
- #include <linux/device_cgroup.h>
- #include <linux/cgroup.h>
- #include <linux/ctype.h>
-+#include <linux/export.h>
- #include <linux/list.h>
- #include <linux/uaccess.h>
- #include <linux/seq_file.h>
-@@ -824,3 +825,4 @@ int __devcgroup_check_permission(short t
+diff --git a/security/device_cgroup.c b/security/device_cgroup.c
+index dc28914fa72e..c2ddfea2b280 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,
  
  	return 0;
  }
 +EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
-Index: linux/security/security.c
-===================================================================
---- linux.orig/security/security.c
-+++ linux/security/security.c
-@@ -546,6 +546,7 @@ int security_path_rmdir(const struct pat
+diff --git a/security/security.c b/security/security.c
+index 5ce2448f3a45..3997af3462bc 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -542,6 +542,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
  		return 0;
  	return call_int_hook(path_rmdir, 0, dir, dentry);
  }
@@ -354,7 +319,7 @@ Index: linux/security/security.c
  
  int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {
-@@ -562,6 +563,7 @@ int security_path_symlink(const struct p
+@@ -558,6 +559,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);
  }
@@ -362,7 +327,7 @@ Index: linux/security/security.c
  
  int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -570,6 +572,7 @@ int security_path_link(struct dentry *ol
+@@ -566,6 +568,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);
  }
@@ -370,7 +335,7 @@ Index: linux/security/security.c
  
  int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
  			 const struct path *new_dir, struct dentry *new_dentry,
-@@ -597,6 +600,7 @@ int security_path_truncate(const struct
+@@ -593,6 +596,7 @@ int security_path_truncate(const struct path *path)
  		return 0;
  	return call_int_hook(path_truncate, 0, path);
  }
@@ -378,7 +343,7 @@ Index: linux/security/security.c
  
  int security_path_chmod(const struct path *path, umode_t mode)
  {
-@@ -604,6 +608,7 @@ int security_path_chmod(const struct pat
+@@ -600,6 +604,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
  		return 0;
  	return call_int_hook(path_chmod, 0, path, mode);
  }
@@ -386,7 +351,7 @@ Index: linux/security/security.c
  
  int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {
-@@ -611,6 +616,7 @@ int security_path_chown(const struct pat
+@@ -607,6 +612,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);
  }
@@ -394,15 +359,7 @@ Index: linux/security/security.c
  
  int security_path_chroot(const struct path *path)
  {
-@@ -696,6 +702,7 @@ int security_inode_readlink(struct dentr
- 		return 0;
- 	return call_int_hook(inode_readlink, 0, dentry);
- }
-+EXPORT_SYMBOL_GPL(security_inode_readlink);
- 
- int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
- 			       bool rcu)
-@@ -711,6 +718,7 @@ int security_inode_permission(struct ino
+@@ -707,6 +713,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return call_int_hook(inode_permission, 0, inode, mask);
  }
@@ -410,7 +367,7 @@ Index: linux/security/security.c
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -882,6 +890,7 @@ int security_file_permission(struct file
+@@ -878,6 +885,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -418,7 +375,7 @@ Index: linux/security/security.c
  
  int security_file_alloc(struct file *file)
  {
-@@ -941,6 +950,7 @@ int security_mmap_file(struct file *file
+@@ -937,6 +945,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }