From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Mon, 3 Oct 2022 06:03:25 +0000 (+0200)
Subject: Initial 6.0 update
X-Git-Tag: auto/th/kernel-6.0.0-1~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=82da57cb64dcd4e6b3dd673ce75d5b2577da1360;p=packages%2Fkernel.git

Initial 6.0 update
---

diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 9827e5c9..2eec84b8 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
-index 5976eb33535f..7dba4acf10ce 100644
+index a547307c1ae8..919ca5404804 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -320,6 +320,7 @@ source "fs/sysv/Kconfig"
+@@ -318,6 +318,7 @@ source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
  source "fs/erofs/Kconfig"
  source "fs/vboxsf/Kconfig"
@@ -14,10 +14,10 @@ index 5976eb33535f..7dba4acf10ce 100644
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
-index 208a74e0b00e..57d47a0762e0 100644
+index 93b80529f8e8..a26c58d09435 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -140,3 +140,4 @@ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
+@@ -138,3 +138,4 @@ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
  obj-$(CONFIG_EROFS_FS)		+= erofs/
  obj-$(CONFIG_VBOXSF_FS)		+= vboxsf/
  obj-$(CONFIG_ZONEFS_FS)		+= zonefs/
@@ -26,10 +26,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 66bffb24a348..9dc7cad5fa1e 100644
+index d30f26e07cd3..2331a15f3550 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3355,6 +3355,19 @@ F:	include/uapi/linux/audit.h
+@@ -3426,6 +3426,19 @@ F:	include/uapi/linux/audit.h
  F:	kernel/audit*
  F:	lib/*audit.c
  
@@ -50,7 +50,7 @@ index 66bffb24a348..9dc7cad5fa1e 100644
  M:	Miguel Ojeda <ojeda@kernel.org>
  S:	Maintained
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 084f9b8a0ba3..a705173cf452 100644
+index ad92192c7d61..8ca56da3ca69 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -645,6 +645,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -79,7 +79,7 @@ index 084f9b8a0ba3..a705173cf452 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 93f4f5ee07bf..cddcf2e44930 100644
+index bb0c4d0038db..d753ad7d77e6 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1345,7 +1345,7 @@ enum d_walk_ret {
@@ -92,7 +92,7 @@ index 93f4f5ee07bf..cddcf2e44930 100644
  {
  	struct dentry *this_parent;
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 34a3faa4886d..68457c0e1e6c 100644
+index 146c9ab0cd4b..c980a0524118 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -33,7 +33,7 @@
@@ -114,7 +114,7 @@ index 34a3faa4886d..68457c0e1e6c 100644
  		return error;
  
 diff --git a/fs/namespace.c b/fs/namespace.c
-index e6a7e769d25d..e0aa17f8c802 100644
+index df137ba19d37..faae7f8644ac 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -852,6 +852,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -131,10 +131,10 @@ index e6a7e769d25d..e0aa17f8c802 100644
   * vfsmount lock must be held for write
   */
 diff --git a/fs/splice.c b/fs/splice.c
-index 047b79db8eb5..a21caa5c54c8 100644
+index 0878b852b355..d83f9e5cddbc 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -759,8 +759,8 @@ static int warn_unsupported(struct file *file, const char *op)
+@@ -756,8 +756,8 @@ static int warn_unsupported(struct file *file, const char *op)
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -145,7 +145,7 @@ index 047b79db8eb5..a21caa5c54c8 100644
  {
  	if (unlikely(!out->f_op->splice_write))
  		return warn_unsupported(out, "write");
-@@ -770,9 +770,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -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.
   */
@@ -159,10 +159,10 @@ index 047b79db8eb5..a21caa5c54c8 100644
  	unsigned int p_space;
  	int ret;
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 9ad5e3520fae..f5aed17b2ce2 100644
+index 9eced4cc286e..773ebd5696e4 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1348,6 +1348,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1364,6 +1364,7 @@ extern void fasync_free(struct fasync_struct *);
  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  
@@ -170,7 +170,7 @@ index 9ad5e3520fae..f5aed17b2ce2 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);
-@@ -1986,6 +1987,7 @@ struct file_operations {
+@@ -2115,6 +2116,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);
@@ -178,7 +178,7 @@ index 9ad5e3520fae..f5aed17b2ce2 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);
-@@ -2483,6 +2485,7 @@ extern int current_umask(void);
+@@ -2615,6 +2617,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);
@@ -186,7 +186,7 @@ index 9ad5e3520fae..f5aed17b2ce2 100644
  
  /* /sys/fs */
  extern struct kobject *fs_kobj;
-@@ -2663,6 +2666,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2795,6 +2798,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
  }
  
  void emergency_thaw_all(void);
@@ -195,10 +195,10 @@ index 9ad5e3520fae..f5aed17b2ce2 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 b6829b970093..af63df9ba503 100644
+index 1f1099dac3f0..81d10b8e9dc0 100644
 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
-@@ -244,6 +244,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
+@@ -248,6 +248,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
  	return lock->key == key;
  }
  
@@ -243,7 +243,7 @@ index a55179fd60fc..8e21c53cf883 100644
 +			 unsigned int flags);
  #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index f06b91ca6482..dedf7da3dd4a 100644
+index 64a13eb56078..c9f30e12aa32 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -217,7 +217,7 @@ unsigned long max_lock_class_idx;
@@ -267,10 +267,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 8dfa36a99c74..548deeffe7d7 100644
+index 93f7e3d971e4..23aa1626020a 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2190,7 +2190,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2218,7 +2218,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) {
@@ -280,10 +280,10 @@ index 8dfa36a99c74..548deeffe7d7 100644
  		rc = 0;
  	}
 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index 13452b32e2bd..38acccfef9d4 100644
+index 4d3493579458..42edd9a42c78 100644
 --- a/fs/proc/nommu.c
 +++ b/fs/proc/nommu.c
-@@ -40,7 +40,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
+@@ -39,7 +39,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
  	file = region->vm_file;
  
  	if (file) {
@@ -296,7 +296,7 @@ index 13452b32e2bd..38acccfef9d4 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 2d04e3470d4c..f57a3bed280a 100644
+index 4e0023643f8b..09394cf6e349 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -281,7 +281,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@@ -311,7 +311,7 @@ index 2d04e3470d4c..f57a3bed280a 100644
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1908,7 +1911,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1912,7 +1915,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;
@@ -337,10 +337,10 @@ index a6d21fc0033c..02c2de31196e 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 cf3d0d673f6b..6b3c1bdf9cde 100644
+index 21f8b27bd9fd..de9572fe212b 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1905,6 +1905,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1858,6 +1858,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
  	unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  
@@ -385,10 +385,10 @@ index cf3d0d673f6b..6b3c1bdf9cde 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 c29ab4c0cd5c..51753b926421 100644
+index cf97f3884fda..a783130a669d 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -367,6 +367,9 @@ struct vm_region {
+@@ -372,6 +372,9 @@ 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 */
@@ -398,7 +398,7 @@ index c29ab4c0cd5c..51753b926421 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
-@@ -463,6 +466,9 @@ struct vm_area_struct {
+@@ -468,6 +471,9 @@ 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). */
@@ -409,7 +409,7 @@ index c29ab4c0cd5c..51753b926421 100644
  
  #ifdef CONFIG_SWAP
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 9d44f2d46c69..089b21708b9a 100644
+index 90c85b17bf69..55406414ade4 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -662,7 +662,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -422,19 +422,19 @@ index 9d44f2d46c69..089b21708b9a 100644
  			if (tmp->vm_flags & VM_SHARED)
  				mapping_allow_writable(mapping);
 diff --git a/mm/Makefile b/mm/Makefile
-index 6f9ffa968a1a..f1e338fa3d10 100644
+index 9a564f836403..86a4be7f34a8 100644
 --- a/mm/Makefile
 +++ b/mm/Makefile
-@@ -133,3 +133,4 @@ obj-$(CONFIG_PAGE_REPORTING) += page_reporting.o
- obj-$(CONFIG_IO_MAPPING) += io-mapping.o
+@@ -134,3 +134,4 @@ obj-$(CONFIG_IO_MAPPING) += io-mapping.o
  obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o
  obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o
+ obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o
 +obj-$(CONFIG_AUFS_FS:m=y) += prfile.o
 diff --git a/mm/filemap.c b/mm/filemap.c
-index ffdfbc8b0e3c..2932f7020bfe 100644
+index 15800334147b..2c22abb4a14d 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -3431,7 +3431,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -3403,7 +3403,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
  	vm_fault_t ret = VM_FAULT_LOCKED;
  
  	sb_start_pagefault(mapping->host->i_sb);
@@ -444,10 +444,10 @@ index ffdfbc8b0e3c..2932f7020bfe 100644
  	if (folio->mapping != mapping) {
  		folio_unlock(folio);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 61e6135c54ef..9a3b117076a8 100644
+index 9d780f415be3..e744ba276454 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
-@@ -189,7 +189,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -142,7 +142,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)
@@ -456,7 +456,7 @@ index 61e6135c54ef..9a3b117076a8 100644
  	mpol_put(vma_policy(vma));
  	vm_area_free(vma);
  	return next;
-@@ -958,7 +958,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
+@@ -911,7 +911,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);
@@ -465,7 +465,7 @@ index 61e6135c54ef..9a3b117076a8 100644
  		}
  		if (next->anon_vma)
  			anon_vma_merge(vma, next);
-@@ -1889,7 +1889,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1845,7 +1845,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  	return addr;
  
  unmap_and_free_vma:
@@ -474,7 +474,7 @@ index 61e6135c54ef..9a3b117076a8 100644
  	vma->vm_file = NULL;
  
  	/* Undo any partial mapping done by a device driver. */
-@@ -2751,7 +2751,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2705,7 +2705,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  		goto out_free_mpol;
  
  	if (new->vm_file)
@@ -483,7 +483,7 @@ index 61e6135c54ef..9a3b117076a8 100644
  
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
-@@ -2770,7 +2770,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2724,7 +2724,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)
@@ -492,7 +492,7 @@ index 61e6135c54ef..9a3b117076a8 100644
  	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
-@@ -2943,6 +2943,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2897,6 +2897,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  	unsigned long populate = 0;
  	unsigned long ret = -EINVAL;
  	struct file *file;
@@ -500,9 +500,9 @@ index 61e6135c54ef..9a3b117076a8 100644
 +	struct file *prfile;
 +#endif
  
- 	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
+ 	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/mm/remap_file_pages.rst.\n",
  		     current->comm, current->pid);
-@@ -2998,10 +3001,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2952,10 +2955,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  	if (vma->vm_flags & VM_LOCKED)
  		flags |= MAP_LOCKED;
  
@@ -537,7 +537,7 @@ index 61e6135c54ef..9a3b117076a8 100644
  out:
  	mmap_write_unlock(mm);
  	if (populate)
-@@ -3275,7 +3302,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3229,7 +3256,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)
@@ -547,7 +547,7 @@ index 61e6135c54ef..9a3b117076a8 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 9d7afc2d959e..917851d5b7c6 100644
+index e819cbc21b39..dc7d40fb197f 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
 @@ -524,7 +524,7 @@ static void __put_nommu_region(struct vm_region *region)
@@ -686,7 +686,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index cddcf2e44930..8e24a158ef4f 100644
+index d753ad7d77e6..1a3b40ebc12b 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1450,6 +1450,7 @@ void d_walk(struct dentry *parent, void *data,
@@ -697,7 +697,7 @@ index cddcf2e44930..8e24a158ef4f 100644
  
  struct check_mount {
  	struct vfsmount *mnt;
-@@ -2996,6 +2997,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -3061,6 +3062,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
  
  	write_sequnlock(&rename_lock);
  }
@@ -706,10 +706,10 @@ index cddcf2e44930..8e24a158ef4f 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index 0989fb8472a1..040741a7fc1a 100644
+index 9a5ca7b82bfc..22cda82470f0 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
-@@ -111,6 +111,7 @@ bool path_noexec(const struct path *path)
+@@ -112,6 +112,7 @@ bool path_noexec(const struct path *path)
  	return (path->mnt->mnt_flags & MNT_NOEXEC) ||
  	       (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
  }
@@ -718,10 +718,10 @@ index 0989fb8472a1..040741a7fc1a 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 68457c0e1e6c..f6affcbcea4f 100644
+index c980a0524118..40087d11a974 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
+@@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
   out:
  	return error;
  }
@@ -730,7 +730,7 @@ index 68457c0e1e6c..f6affcbcea4f 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 5424e3a8df5f..d2fe19f88894 100644
+index 99c6796c9f28..ad533dcedfec 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
 @@ -198,6 +198,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
@@ -742,7 +742,7 @@ index 5424e3a8df5f..d2fe19f88894 100644
  /*
   * Variant of alloc_empty_file() that doesn't check and modify nr_files.
 diff --git a/fs/namespace.c b/fs/namespace.c
-index e0aa17f8c802..a8c5bed09874 100644
+index faae7f8644ac..0310c99a83dd 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -456,6 +456,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -782,7 +782,7 @@ index 1de6631a3925..3008eb37a18d 100644
  /*
   * Drop a reference to a group.  Free it if it's through.
 diff --git a/fs/open.c b/fs/open.c
-index 1d57fbde2feb..50d04ab40175 100644
+index 8a813fa5ca56..29f5960ec109 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -66,6 +66,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,
@@ -794,10 +794,10 @@ index 1d57fbde2feb..50d04ab40175 100644
  long vfs_truncate(const struct path *path, loff_t length)
  {
 diff --git a/fs/read_write.c b/fs/read_write.c
-index e0777eefd846..5e4413802f73 100644
+index 1a261dcf1778..937646c50ea4 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -489,6 +489,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
+@@ -477,6 +477,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
  	inc_syscr(current);
  	return ret;
  }
@@ -805,7 +805,7 @@ index e0777eefd846..5e4413802f73 100644
  
  static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
  {
-@@ -599,6 +600,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
+@@ -586,6 +587,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
  	file_end_write(file);
  	return ret;
  }
@@ -814,10 +814,10 @@ index e0777eefd846..5e4413802f73 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 a21caa5c54c8..ccf9e1681eb7 100644
+index d83f9e5cddbc..ac355ebeb9f0 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -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);
  }
@@ -825,7 +825,7 @@ index a21caa5c54c8..ccf9e1681eb7 100644
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -795,6 +796,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -792,6 +793,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);
  }
@@ -834,10 +834,10 @@ index a21caa5c54c8..ccf9e1681eb7 100644
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/fs/xattr.c b/fs/xattr.c
-index e8dd03e4561e..fd922e39d42d 100644
+index a1f4998bc6be..284d4ca54893 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
-@@ -386,6 +386,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
+@@ -396,6 +396,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
  	*xattr_value = value;
  	return error;
  }
@@ -846,7 +846,7 @@ index e8dd03e4561e..fd922e39d42d 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 dedf7da3dd4a..2c74c70f4816 100644
+index c9f30e12aa32..d04fedf1e4d9 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -238,6 +238,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -867,7 +867,7 @@ index dff75bcde151..30b814618535 100644
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/security.c b/security/security.c
-index 188b8f782220..6847a174a55f 100644
+index 4b95de24bc8d..139e1443c49b 100644
 --- a/security/security.c
 +++ b/security/security.c
 @@ -1165,6 +1165,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
@@ -924,9 +924,9 @@ index 188b8f782220..6847a174a55f 100644
  }
 +EXPORT_SYMBOL_GPL(security_inode_permission);
  
- int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
- {
-@@ -1520,6 +1527,7 @@ int security_file_permission(struct file *file, int mask)
+ int security_inode_setattr(struct user_namespace *mnt_userns,
+ 			   struct dentry *dentry, struct iattr *attr)
+@@ -1521,6 +1528,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -936,7 +936,7 @@ index 188b8f782220..6847a174a55f 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	2022-08-02 12:12:45.158975302 +0200
++++ linux/Documentation/ABI/testing/debugfs-aufs	2022-03-21 14:49:05.713299677 +0100
 @@ -0,0 +1,55 @@
 +What:		/debug/aufs/si_<id>/
 +Date:		March 2009
@@ -995,7 +995,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	2022-08-02 12:12:45.158975302 +0200
++++ linux/Documentation/ABI/testing/sysfs-aufs	2022-03-21 14:49:05.713299677 +0100
 @@ -0,0 +1,31 @@
 +What:		/sys/fs/aufs/si_<id>/
 +Date:		March 2009
@@ -1030,7 +1030,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	2022-08-02 12:12:45.158975302 +0200
++++ linux/Documentation/filesystems/aufs/design/01intro.txt	2022-03-21 14:49:05.713299677 +0100
 @@ -0,0 +1,171 @@
 +
 +# Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -1205,7 +1205,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/02struct.txt	2022-03-21 14:49:05.713299677 +0100
 @@ -0,0 +1,258 @@
 +
 +# Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -1467,7 +1467,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt	2022-03-21 14:49:05.713299677 +0100
 @@ -0,0 +1,85 @@
 +
 +# Copyright (C) 2015-2021 Junjiro R. Okajima
@@ -1556,7 +1556,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2022-03-21 14:49:05.713299677 +0100
 @@ -0,0 +1,113 @@
 +
 +# Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -1673,7 +1673,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/04branch.txt	2022-03-21 14:49:05.713299677 +0100
 @@ -0,0 +1,74 @@
 +
 +# Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -1751,7 +1751,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2022-03-21 14:49:05.713299677 +0100
 @@ -0,0 +1,64 @@
 +
 +# Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -1819,7 +1819,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot	2022-03-21 14:49:05.713299677 +0100
 @@ -0,0 +1,31 @@
 +
 +// to view this graph, run dot(1) command in GRAPHVIZ.
@@ -1854,7 +1854,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt	2022-10-03 07:51:14.926209260 +0200
 @@ -0,0 +1,102 @@
 +
 +# Copyright (C) 2017-2021 Junjiro R. Okajima
@@ -1960,7 +1960,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt	2022-03-21 14:49:05.716633010 +0100
 @@ -0,0 +1,120 @@
 +
 +# Copyright (C) 2011-2021 Junjiro R. Okajima
@@ -2084,7 +2084,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2022-03-21 14:49:05.716633010 +0100
 @@ -0,0 +1,72 @@
 +
 +# Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -2160,7 +2160,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt	2022-03-21 14:49:05.716633010 +0100
 @@ -0,0 +1,96 @@
 +
 +# Copyright (C) 2014-2021 Junjiro R. Okajima
@@ -2260,7 +2260,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/07export.txt	2022-03-21 14:49:05.716633010 +0100
 @@ -0,0 +1,58 @@
 +
 +# Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -2322,7 +2322,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2022-03-21 14:49:05.716633010 +0100
 @@ -0,0 +1,52 @@
 +
 +# Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -2378,7 +2378,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2022-03-21 14:49:05.716633010 +0100
 @@ -0,0 +1,47 @@
 +
 +# Copyright (C) 2010-2021 Junjiro R. Okajima
@@ -2429,7 +2429,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	2022-08-02 12:12:45.158975302 +0200
++++ linux/Documentation/filesystems/aufs/README	2022-10-03 07:51:14.922875926 +0200
 @@ -0,0 +1,397 @@
 +
 +Aufs5 -- advanced multi layered unification filesystem version 5.x
@@ -2830,7 +2830,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/aufs.h	2022-03-21 14:49:05.716633010 +0100
 @@ -0,0 +1,62 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -2896,7 +2896,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/branch.c	2022-10-03 07:51:14.926209260 +0200
 @@ -0,0 +1,1427 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -4327,7 +4327,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/branch.h	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,375 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -4706,7 +4706,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/conf.mk	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,40 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -4750,7 +4750,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/cpup.c	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,1459 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -6213,7 +6213,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/cpup.h	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,100 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -6317,7 +6317,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/dbgaufs.c	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,526 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -6847,7 +6847,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/dbgaufs.h	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,53 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -6904,7 +6904,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/dcsub.c	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,225 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -7133,7 +7133,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/dcsub.h	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,137 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -7274,7 +7274,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/debug.c	2022-10-03 07:51:14.926209260 +0200
 @@ -0,0 +1,444 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -7722,7 +7722,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/debug.h	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,226 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -7952,7 +7952,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/dentry.c	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,1168 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -9124,7 +9124,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/dentry.h	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,269 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -9397,7 +9397,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/dinfo.c	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,554 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -9955,7 +9955,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/dir.c	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,765 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -10724,7 +10724,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/dir.h	2022-03-21 14:49:05.719966344 +0100
 @@ -0,0 +1,134 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -10862,7 +10862,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/dirren.c	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,1315 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -12181,7 +12181,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/dirren.h	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,140 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -12325,8 +12325,8 @@ 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	2022-08-02 12:12:45.165641939 +0200
-@@ -0,0 +1,368 @@
++++ linux/fs/aufs/dynop.c	2022-10-03 07:51:14.926209260 +0200
+@@ -0,0 +1,366 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2010-2021 Junjiro R. Okajima
@@ -12517,9 +12517,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 +	DySetAop(free_folio);
 +	/* this one will be changed according to an aufs mount option */
 +	DySetAop(direct_IO);
-+	DySetAop(migratepage);
-+	DySetAop(isolate_page);
-+	DySetAop(putback_page);
++	DySetAop(migrate_folio);
 +	DySetAop(launder_folio);
 +	DySetAop(is_partially_uptodate);
 +	DySetAop(is_dirty_writeback);
@@ -12697,7 +12695,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/dynop.h	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,77 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -12778,7 +12776,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/export.c	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,830 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -13612,7 +13610,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/fhsm.c	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,427 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -14043,8 +14041,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	2022-08-02 12:12:45.165641939 +0200
-@@ -0,0 +1,864 @@
++++ linux/fs/aufs/file.c	2022-10-03 07:51:14.926209260 +0200
+@@ -0,0 +1,858 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -14855,14 +14853,10 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +static bool aufs_release_folio(struct folio *folio, gfp_t gfp)
 +{ AuUnsupport(); return true; }
 +#if 0 /* called by memory compaction regardless file */
-+static int aufs_migratepage(struct address_space *mapping, struct page *newpage,
-+			    struct page *page, enum migrate_mode mode)
++static int aufs_migrate_folio(struct address_space *mapping, struct folio *dst,
++			      struct folio *src, enum migrate_mode mode)
 +{ AuUnsupport(); return 0; }
 +#endif
-+static bool aufs_isolate_page(struct page *page, isolate_mode_t mode)
-+{ AuUnsupport(); return true; }
-+static void aufs_putback_page(struct page *page)
-+{ AuUnsupport(); }
 +static int aufs_launder_folio(struct folio *folio)
 +{ AuUnsupport(); return 0; }
 +static bool aufs_is_partially_uptodate(struct folio *folio, size_t from,
@@ -14897,9 +14891,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +	.invalidate_folio	= aufs_invalidate_folio,
 +	.release_folio		= aufs_release_folio,
 +	/* is fallback_migrate_page ok? */
-+	/* .migratepage		= aufs_migratepage, */
-+	.isolate_page		= aufs_isolate_page,
-+	.putback_page		= aufs_putback_page,
++	/* .migrate_folio	= aufs_migrate_folio, */
 +	.launder_folio		= aufs_launder_folio,
 +	.is_partially_uptodate	= aufs_is_partially_uptodate,
 +	.is_dirty_writeback	= aufs_is_dirty_writeback,
@@ -14911,7 +14903,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/file.h	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,342 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -15257,7 +15249,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/finfo.c	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,149 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -15410,7 +15402,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/f_op.c	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,771 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -16185,7 +16177,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +};
 diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.c
 --- /usr/share/empty/fs/aufs/fsctx.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fsctx.c	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/fsctx.c	2022-10-03 07:51:14.926209260 +0200
 @@ -0,0 +1,1242 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -17431,7 +17423,7 @@ diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/fstype.h	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,401 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -17836,7 +17828,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/hbl.h	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,65 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -17905,7 +17897,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/hfsnotify.c	2022-10-03 07:51:14.926209260 +0200
 @@ -0,0 +1,290 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -18199,7 +18191,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/hfsplus.c	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,60 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -18263,7 +18255,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/hnotify.c	2022-03-21 14:49:05.723299677 +0100
 @@ -0,0 +1,715 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -18982,7 +18974,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/iinfo.c	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,286 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -19272,7 +19264,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/inode.c	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,531 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -19807,7 +19799,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/inode.h	2022-10-03 07:51:14.929542593 +0200
 @@ -0,0 +1,705 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -20151,7 +20143,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 +	union {
 +		struct {
 +			const char	*name;
-+			const void	*value;
++			void		*value;
 +			size_t		size;
 +			int		flags;
 +		} set;
@@ -20516,7 +20508,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/ioctl.c	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,220 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -20740,7 +20732,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/i_op_add.c	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,941 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -21685,7 +21677,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/i_op.c	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,1512 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -23201,7 +23193,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/i_op_del.c	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,522 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -23727,7 +23719,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/i_op_ren.c	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,1257 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -24988,7 +24980,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/Kconfig	2022-10-03 07:51:14.926209260 +0200
 @@ -0,0 +1,199 @@
 +# SPDX-License-Identifier: GPL-2.0
 +config AUFS_FS
@@ -25191,7 +25183,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/lcnt.h	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,186 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -25381,7 +25373,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/loop.c	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,148 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -25533,7 +25525,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/loop.h	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,55 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -25592,7 +25584,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/magic.mk	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,31 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -25627,7 +25619,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	2022-08-02 12:12:45.162308621 +0200
++++ linux/fs/aufs/Makefile	2022-03-21 14:49:05.716633010 +0100
 @@ -0,0 +1,46 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -25677,7 +25669,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/module.c	2022-03-21 14:49:05.726633010 +0100
 @@ -0,0 +1,273 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -25954,7 +25946,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/module.h	2022-05-23 09:44:37.729839166 +0200
 @@ -0,0 +1,180 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -26138,7 +26130,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/mvdown.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,706 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -26848,7 +26840,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/opts.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,1032 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -27884,7 +27876,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/opts.h	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,263 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -28151,7 +28143,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	2022-08-02 12:12:45.165641939 +0200
++++ linux/fs/aufs/plink.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,516 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28671,7 +28663,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/poll.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,51 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28726,7 +28718,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/posix_acl.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,111 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28841,7 +28833,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/procfs.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,170 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -29015,7 +29007,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/rdu.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,384 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -29403,7 +29395,7 @@ 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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/rwsem.h	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,85 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -29492,7 +29484,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/sbinfo.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,316 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -29812,7 +29804,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/super.c	2022-05-23 09:44:37.729839166 +0200
 @@ -0,0 +1,871 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -30687,7 +30679,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/super.h	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,592 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -31283,7 +31275,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/sysaufs.c	2022-05-23 09:44:37.729839166 +0200
 @@ -0,0 +1,94 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -31381,7 +31373,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/sysaufs.h	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,102 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -31487,7 +31479,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/sysfs.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,374 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -31865,7 +31857,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/sysrq.c	2022-03-21 14:49:05.729966343 +0100
 @@ -0,0 +1,149 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -32018,7 +32010,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/vdir.c	2022-03-21 14:49:05.733299677 +0100
 @@ -0,0 +1,896 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -32918,7 +32910,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/vfsub.c	2022-03-21 14:49:05.733299677 +0100
 @@ -0,0 +1,918 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -33840,8 +33832,8 @@ 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	2022-08-02 12:12:45.168975258 +0200
-@@ -0,0 +1,358 @@
++++ linux/fs/aufs/vfsub.h	2022-10-03 07:51:14.929542593 +0200
+@@ -0,0 +1,362 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
 + * Copyright (C) 2005-2021 Junjiro R. Okajima
@@ -34173,9 +34165,13 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 +
 +/* ---------------------------------------------------------------------- */
 +
++/*
++ * The parameter 'value' is not const since the id in ACL_USER/ACL_GROUP may be
++ * changed by idmapping.
++ */
 +static inline int vfsub_setxattr(struct user_namespace *userns,
 +				 struct dentry *dentry, const char *name,
-+				 const void *value, size_t size, int flags)
++				 void *value, size_t size, int flags)
 +{
 +	int err;
 +
@@ -34202,7 +34198,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/wbr_policy.c	2022-03-21 14:49:05.733299677 +0100
 @@ -0,0 +1,830 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -35036,7 +35032,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/whout.c	2022-03-21 14:49:05.733299677 +0100
 @@ -0,0 +1,1072 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -36112,7 +36108,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/whout.h	2022-03-21 14:49:05.733299677 +0100
 @@ -0,0 +1,87 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -36203,7 +36199,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/wkq.c	2022-03-21 14:49:05.733299677 +0100
 @@ -0,0 +1,372 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -36579,7 +36575,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/wkq.h	2022-03-21 14:49:05.733299677 +0100
 @@ -0,0 +1,89 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -36672,8 +36668,8 @@ 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	2022-08-02 12:12:45.168975258 +0200
-@@ -0,0 +1,368 @@
++++ linux/fs/aufs/xattr.c	2022-10-03 07:51:14.929542593 +0200
+@@ -0,0 +1,372 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2014-2021 Junjiro R. Okajima
@@ -36988,7 +36984,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +}
 +
 +static int au_setxattr(struct dentry *dentry, struct inode *inode,
-+		       const char *name, const void *value, size_t size,
++		       const char *name, void *value, size_t size,
 +		       int flags)
 +{
 +	struct au_sxattr arg = {
@@ -37013,13 +37009,17 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +	return au_getxattr(dentry, inode, name, buffer, size);
 +}
 +
++/*
++ * The prameter 'void *value' of vfs_setxattr() is NOT const, but
++ * xattr_handler->set() requires const. Is it OK? I don't know.
++ */
 +static int au_xattr_set(const struct xattr_handler *handler,
 +			struct user_namespace *userns,
 +			struct dentry *dentry, struct inode *inode,
 +			const char *name, const void *value, size_t size,
 +			int flags)
 +{
-+	return au_setxattr(dentry, inode, name, value, size, flags);
++	return au_setxattr(dentry, inode, name, (void *)value, size, flags);
 +}
 +
 +static const struct xattr_handler au_xattr_handler = {
@@ -37044,7 +37044,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/fs/aufs/xino.c	2022-03-21 14:49:05.733299677 +0100
 @@ -0,0 +1,1926 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -38974,7 +38974,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	2022-08-02 12:12:45.168975258 +0200
++++ linux/include/uapi/linux/aufs_type.h	2022-10-03 07:51:14.929542593 +0200
 @@ -0,0 +1,452 @@
 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +/*
@@ -39018,7 +39018,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-20220711"
++#define AUFS_VERSION	"5.x-rcN-20220912"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39432,7 +39432,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN loopback patch
 
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index a705173cf452..642a93f4fdee 100644
+index 8ca56da3ca69..9ac6f67edf09 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -54,7 +54,7 @@ struct loop_device {
@@ -39514,7 +39514,7 @@ index a705173cf452..642a93f4fdee 100644
  	goto done;
  }
  
-@@ -1008,6 +1031,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1013,6 +1036,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
  			  const struct loop_config *config)
  {
  	struct file *file = fget(config->fd);
@@ -39522,7 +39522,7 @@ index a705173cf452..642a93f4fdee 100644
  	struct inode *inode;
  	struct address_space *mapping;
  	int error;
-@@ -1026,6 +1050,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1031,6 +1055,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
  	/* suppress uevents while reconfiguring the device */
  	dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 1);
  
@@ -39536,7 +39536,7 @@ index a705173cf452..642a93f4fdee 100644
  	/*
  	 * If we don't hold exclusive handle for the device, upgrade to it
  	 * here to avoid changing device under exclusive owner.
-@@ -1086,6 +1117,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1091,6 +1122,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;
@@ -39544,7 +39544,7 @@ index a705173cf452..642a93f4fdee 100644
  	lo->old_gfp_mask = mapping_gfp_mask(mapping);
  	mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
  
-@@ -1141,6 +1173,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1146,6 +1178,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
  		bd_abort_claiming(bdev, loop_configure);
  out_putf:
  	fput(file);
@@ -39553,7 +39553,7 @@ index a705173cf452..642a93f4fdee 100644
  	/* This is safe: open() is still holding a reference. */
  	module_put(THIS_MODULE);
  	goto done;
-@@ -1149,6 +1183,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1154,6 +1188,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
  static void __loop_clr_fd(struct loop_device *lo, bool release)
  {
  	struct file *filp;
@@ -39561,7 +39561,7 @@ index a705173cf452..642a93f4fdee 100644
  	gfp_t gfp = lo->old_gfp_mask;
  
  	if (test_bit(QUEUE_FLAG_WC, &lo->lo_queue->queue_flags))
-@@ -1165,6 +1200,7 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1170,6 +1205,7 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
  	spin_lock_irq(&lo->lo_lock);
  	filp = lo->lo_backing_file;
  	lo->lo_backing_file = NULL;
@@ -39569,7 +39569,7 @@ index a705173cf452..642a93f4fdee 100644
  	spin_unlock_irq(&lo->lo_lock);
  
  	lo->lo_device = NULL;
-@@ -1227,6 +1263,8 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1232,6 +1268,8 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
  	 * fput can take open_mutex which is usually taken before lo_mutex.
  	 */
  	fput(filp);
@@ -39654,10 +39654,10 @@ index 7d9bcc074c87..0eefe350c01c 100644
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index f5aed17b2ce2..6b2d2256be5f 100644
+index 773ebd5696e4..4baca7d85d52 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -2121,6 +2121,10 @@ struct super_operations {
+@@ -2253,6 +2253,10 @@ struct super_operations {
  				  struct shrink_control *);
  	long (*free_cached_objects)(struct super_block *,
  				    struct shrink_control *);
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 01906029..96eb9b52 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -187,6 +187,7 @@ CRYPTO_KEYWRAP all=m
 CRYPTO_NHPOLY1305_SSE2 all=m
 CRYPTO_NHPOLY1305_AVX2 all=m
 CRYPTO_ADIANTUM all=m
+CRYPTO_HCTR2 all=m
 CRYPTO_ESSIV all=m
 #- Hash modes
 CRYPTO_CMAC all=m
@@ -205,6 +206,7 @@ CRYPTO_CRCT10DIF all=y
 CRYPTO_CRCT10DIF_PCLMUL all=m
 CRYPTO_CRC64_ROCKSOFT all=m
 CRYPTO_GHASH all=m
+CRYPTO_POLYVAL_CLMUL_NI all=m
 CRYPTO_POLY1305 all=m
 CRYPTO_POLY1305_X86_64 all=m
 CRYPTO_MD4 all=m
@@ -247,6 +249,7 @@ CRYPTO_KHAZAD all=m
 CRYPTO_CHACHA20 all=m
 CRYPTO_CHACHA20_X86_64 all=m
 CRYPTO_SEED all=m
+CRYPTO_ARIA all=m
 CRYPTO_SERPENT all=m
 CRYPTO_SERPENT_SSE2_X86_64 all=m
 CRYPTO_SERPENT_SSE2_586 all=m
@@ -369,8 +372,8 @@ ACPI_PFRUT all=m
 #- file drivers/acpi/arm64/Kconfig goes here
 ACPI_PCC all=y
 #- file drivers/acpi/pmic/Kconfig goes here
-X86_PM_TIMER x86=y
 ACPI_PRMT=y
+X86_PM_TIMER x86=y
 
 #-
 #- *** FILE: drivers/acpi/apei/Kconfig ***
@@ -413,7 +416,7 @@ TPS68470_PMIC_OPREGION=y
 #-
 #- *** FILE: drivers/android/Kconfig ***
 #-
-ANDROID all=n
+ANDROID_BINDER_IPC all=n
 
 #-
 #- *** FILE: drivers/ata/Kconfig ***
@@ -638,7 +641,6 @@ BLK_DEV_LOOP all=m
 BLK_DEV_LOOP_MIN_COUNT all=8
 #- file drivers/block/drbd/Kconfig goes here
 BLK_DEV_NBD all=m
-BLK_DEV_SX8 all=m
 BLK_DEV_RAM all=y
 BLK_DEV_RAM_COUNT all=16
 BLK_DEV_RAM_SIZE all=16384
@@ -652,6 +654,7 @@ XEN_BLKDEV_FRONTEND all=m
 XEN_BLKDEV_BACKEND all=m
 VIRTIO_BLK all=m
 BLK_DEV_RBD all=m
+BLK_DEV_UBLK all=m
 #- file drivers/block/rnbd/Kconfig goes here
 
 #-
@@ -886,6 +889,7 @@ HW_RANDOM_TPM all=y
 TCG_TIS all=m x86=y ia64=y
 TCG_TIS_SPI all=m
 TCG_TIS_SPI_CR50 all=y
+TCG_TIS_I2C all=m
 TCG_TIS_I2C_CR50 all=m
 TCG_TIS_I2C_ATMEL all=m
 TCG_TIS_I2C_INFINEON all=m
@@ -1606,7 +1610,6 @@ ARM_SCMI_PROTOCOL arm=n arm64=n
 #-
 #- *** FILE: drivers/firmware/efi/Kconfig ***
 #-
-EFI_VARS all=m
 EFI_VARS_PSTORE all=m
 EFI_VARS_PSTORE_DEFAULT_DISABLE all=n
 EFI_RUNTIME_MAP all=y
@@ -1680,6 +1683,8 @@ FPGA_DFL_FME_REGION all=m
 FPGA_DFL_AFU all=m
 FPGA_DFL_NIOS_INTEL_PAC_N3000 all=m
 FPGA_DFL_PCI all=m
+FPGA_M10_BMC_SEC_UPDATE all=m
+FPGA_MGR_MICROCHIP_SPI all=m
 
 #-
 #- *** FILE: drivers/fsi/Kconfig ***
@@ -1859,6 +1864,7 @@ DRM_VKMS all=m
 #- file drivers/gpu/drm/vc4/Kconfig goes here
 #- file drivers/gpu/drm/etnaviv/Kconfig goes here
 #- file drivers/gpu/drm/hisilicon/Kconfig goes here
+#- file drivers/gpu/drm/logicvc/Kconfig goes here
 #- file drivers/gpu/drm/mediatek/Kconfig goes here
 #- file drivers/gpu/drm/mxsfb/Kconfig goes here
 #- file drivers/gpu/drm/meson/Kconfig goes here
@@ -1982,6 +1988,7 @@ DRM_TI_TPD12S015 arm=m arm64=m
 #- file drivers/gpu/drm/bridge/analogix/Kconfig goes here
 #- file drivers/gpu/drm/bridge/adv7511/Kconfig goes here
 #- file drivers/gpu/drm/bridge/cadence/Kconfig goes here
+#- file drivers/gpu/drm/bridge/imx/Kconfig goes here
 #- file drivers/gpu/drm/bridge/synopsys/Kconfig goes here
 
 #-
@@ -2810,6 +2817,7 @@ SENSORS_IRPS5401 all=m
 SENSORS_ISL68137 all=m
 SENSORS_LM25066 all=m
 SENSORS_LM25066_REGULATOR all=y
+SENSORS_LT7182S all=m
 SENSORS_LTC2978 all=m
 SENSORS_LTC2978_REGULATOR all=y
 SENSORS_LTC3815 all=m
@@ -3130,7 +3138,7 @@ CC10001_ADC all=m
 CPCAP_ADC arm=m arm64=m
 DA9150_GPADC all=m
 DLN2_ADC all=m
-ENVELOPE_DETECTOR arm=m arm64=m
+ENVELOPE_DETECTOR all=m
 HI8435 all=m
 HX711 all=m
 INA2XX_ADC all=m
@@ -3159,7 +3167,7 @@ QCOM_SPMI_VADC all=m
 QCOM_SPMI_ADC5 all=m
 RN5T618_ADC arm=m arm64=m
 ROCKCHIP_SARADC arm64=m
-SD_ADC_MODULATOR arm=m arm64=m
+SD_ADC_MODULATOR all=m
 STMPE_ADC arm=m arm64=m
 STX104 all=m
 TI_ADC081C all=m
@@ -3178,7 +3186,7 @@ TI_ADS131E08 all=m
 TI_AM335X_ADC all=m
 TI_TLC4541 all=m
 TI_TSC2046=m
-VF610_ADC arm=m arm64=m
+VF610_ADC all=m
 VIPERBOARD_ADC all=m
 XILINX_XADC all=m
 
@@ -3600,20 +3608,21 @@ INFINIBAND_USER_ACCESS all=m sparc=
 INFINIBAND_USER_MEM all=y sparc=
 INFINIBAND_ON_DEMAND_PAGING all=y
 INFINIBAND_ADDR_TRANS all=y sparc=
-#- file drivers/infiniband/hw/mthca/Kconfig goes here
-#- file drivers/infiniband/hw/qib/Kconfig goes here
+#- file drivers/infiniband/hw/bnxt_re/Kconfig goes here
 #- file drivers/infiniband/hw/cxgb4/Kconfig goes here
 #- file drivers/infiniband/hw/efa/Kconfig goes here
+#- file drivers/infiniband/hw/erdma/Kconfig goes here
+#- file drivers/infiniband/hw/hfi1/Kconfig goes here
+#- file drivers/infiniband/hw/hns/Kconfig goes here
 #- file drivers/infiniband/hw/irdma/Kconfig goes here
 #- file drivers/infiniband/hw/mlx4/Kconfig goes here
 #- file drivers/infiniband/hw/mlx5/Kconfig goes here
+#- file drivers/infiniband/hw/mthca/Kconfig goes here
 #- file drivers/infiniband/hw/ocrdma/Kconfig goes here
-#- file drivers/infiniband/hw/vmw_pvrdma/Kconfig goes here
-#- file drivers/infiniband/hw/usnic/Kconfig goes here
-#- file drivers/infiniband/hw/hns/Kconfig goes here
-#- file drivers/infiniband/hw/bnxt_re/Kconfig goes here
-#- file drivers/infiniband/hw/hfi1/Kconfig goes here
 #- file drivers/infiniband/hw/qedr/Kconfig goes here
+#- file drivers/infiniband/hw/qib/Kconfig goes here
+#- file drivers/infiniband/hw/usnic/Kconfig goes here
+#- file drivers/infiniband/hw/vmw_pvrdma/Kconfig goes here
 #- file drivers/infiniband/sw/rdmavt/Kconfig goes here
 #- file drivers/infiniband/sw/rxe/Kconfig goes here
 #- file drivers/infiniband/sw/siw/Kconfig goes here
@@ -3640,6 +3649,11 @@ INFINIBAND_CXGB4 all=m
 #-
 INFINIBAND_EFA all=m
 
+#-
+#- *** FILE: drivers/infiniband/hw/erdma/Kconfig ***
+#-
+INFINIBAND_ERDMA all=m
+
 #-
 #- *** FILE: drivers/infiniband/hw/hfi1/Kconfig ***
 #-
@@ -4137,7 +4151,7 @@ TOUCHSCREEN_SX8654 all=m
 TOUCHSCREEN_TPS6507X all=m
 TOUCHSCREEN_ZET6223 all=m
 TOUCHSCREEN_ZFORCE all=m
-TOUCHSCREEN_COLIBRI_VF50 arm=m arm64=m
+TOUCHSCREEN_COLIBRI_VF50 all=m
 TOUCHSCREEN_ROHM_BU21023 all=m
 TOUCHSCREEN_IQS5XX all=m
 TOUCHSCREEN_ZINITIX all=m
@@ -4309,7 +4323,7 @@ LEDS_MAX77650 arm=m arm64=m
 LEDS_LM355x all=m
 LEDS_OT200 all=m
 LEDS_MENF21BMC all=m
-LEDS_IS31FL319X arm=m arm64=m
+LEDS_IS31FL319X all=m
 LEDS_IS31FL32XX arm=m arm64=m
 #- LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 LEDS_BLINKM all=m
@@ -4685,6 +4699,7 @@ DVB_FIREDTV all=m
 #- *** FILE: drivers/media/i2c/Kconfig ***
 #-
 #- IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+VIDEO_AR0521 all=m
 VIDEO_HI556 all=m
 VIDEO_HI846 all=m
 VIDEO_HI847 all=m
@@ -5279,7 +5294,6 @@ MEDIA_USB_SUPPORT all=y
 #- file drivers/media/usb/gspca/Kconfig goes here
 #- file drivers/media/usb/pwc/Kconfig goes here
 #- file drivers/media/usb/s2255/Kconfig goes here
-#- file drivers/media/usb/stkwebcam/Kconfig goes here
 #- file drivers/media/usb/usbtv/Kconfig goes here
 #- file drivers/media/usb/uvc/Kconfig goes here
 #- file drivers/media/usb/zr364xx/Kconfig goes here
@@ -5524,11 +5538,6 @@ SMS_USB_DRV all=m
 VIDEO_STK1160_COMMON all=m
 VIDEO_STK1160 all=m
 
-#-
-#- *** FILE: drivers/media/usb/stkwebcam/Kconfig ***
-#-
-USB_STKWEBCAM all=m
-
 #-
 #- *** FILE: drivers/media/usb/tm6000/Kconfig ***
 #-
@@ -6275,6 +6284,7 @@ MHI_NET all=m
 #- file drivers/net/ipa/Kconfig goes here
 NET_SB1000 all=m
 #- file drivers/net/phy/Kconfig goes here
+#- file drivers/net/can/Kconfig goes here
 #- file drivers/net/mctp/Kconfig goes here
 #- file drivers/net/mdio/Kconfig goes here
 #- file drivers/net/pcs/Kconfig goes here
@@ -6333,15 +6343,17 @@ CAIF_VIRTIO all=m
 #-
 #- *** FILE: drivers/net/can/Kconfig ***
 #-
+CAN_DEV all=m
 CAN_VCAN all=m
 CAN_VXCAN all=m
-CAN_SLCAN all=m
-CAN_DEV all=m
+CAN_NETLINK all=y
 CAN_CALC_BITTIMING all=y
+CAN_CAN327 all=m
 CAN_FLEXCAN arm=m arm64=m
 CAN_GRCAN arm=m arm64=m
 CAN_JANZ_ICAN3 all=m
 CAN_KVASER_PCIEFD all=m
+CAN_SLCAN all=m
 CAN_TI_HECC arm=m
 CAN_XILINXCAN arm64=m
 PCH_CAN all=m
@@ -6443,7 +6455,7 @@ CAN_MCP251XFD_SANITY all=y
 #-
 CAN_8DEV_USB all=m
 CAN_EMS_USB all=m
-CAN_ESD_USB2 all=m
+CAN_ESD_USB all=m
 CAN_ETAS_ES58X all=m
 CAN_GS_USB all=m
 CAN_KVASER_USB all=m
@@ -6467,7 +6479,6 @@ NET_DSA_MV88E6060 all=m
 #- file drivers/net/dsa/qca/Kconfig goes here
 #- file drivers/net/dsa/sja1105/Kconfig goes here
 #- file drivers/net/dsa/xrs700x/Kconfig goes here
-NET_DSA_QCA8K all=m
 #- file drivers/net/dsa/realtek/Kconfig goes here
 NET_DSA_SMSC_LAN9303_I2C all=m
 NET_DSA_SMSC_LAN9303_MDIO all=m
@@ -6492,11 +6503,9 @@ NET_DSA_HIRSCHMANN_HELLCREEK all=m
 #-
 #- *** FILE: drivers/net/dsa/microchip/Kconfig ***
 #-
-NET_DSA_MICROCHIP_KSZ9477 all=m
+NET_DSA_MICROCHIP_KSZ_COMMON all=m
 NET_DSA_MICROCHIP_KSZ9477_I2C all=m
-NET_DSA_MICROCHIP_KSZ9477_SPI all=m
-NET_DSA_MICROCHIP_KSZ8795 all=m
-NET_DSA_MICROCHIP_KSZ8795_SPI all=m
+NET_DSA_MICROCHIP_KSZ_SPI all=m
 NET_DSA_MICROCHIP_KSZ8863_SMI all=m
 
 #-
@@ -6515,6 +6524,7 @@ NET_DSA_MSCC_SEVILLE all=m
 #- *** FILE: drivers/net/dsa/qca/Kconfig ***
 #-
 NET_DSA_AR9331 all=m
+NET_DSA_QCA8K all=m
 
 #-
 #- *** FILE: drivers/net/dsa/realtek/Kconfig ***
@@ -6610,6 +6620,7 @@ DNET all=m
 #- file drivers/net/ethernet/i825xx/Kconfig goes here
 #- file drivers/net/ethernet/ibm/Kconfig goes here
 #- file drivers/net/ethernet/intel/Kconfig goes here
+#- file drivers/net/ethernet/wangxun/Kconfig goes here
 #- file drivers/net/ethernet/xscale/Kconfig goes here
 JME all=m
 #- file drivers/net/ethernet/litex/Kconfig goes here
@@ -7192,8 +7203,6 @@ NS83820 all=m
 #-
 NET_VENDOR_NETERION all=y
 S2IO all=m sparc=n
-VXGE all=m
-VXGE_DEBUG_TRACE_ALL all=n
 
 #-
 #- *** FILE: drivers/net/ethernet/netronome/Kconfig ***
@@ -7446,6 +7455,12 @@ VIA_RHINE all=m
 VIA_RHINE_MMIO all=y alpha=n
 VIA_VELOCITY all=m
 
+#-
+#- *** FILE: drivers/net/ethernet/wangxun/Kconfig ***
+#-
+NET_VENDOR_WANGXUN all=y
+TXGBE all=m
+
 #-
 #- *** FILE: drivers/net/ethernet/wiznet/Kconfig ***
 #-
@@ -8446,6 +8461,7 @@ NVME_HWMON all=y
 NVME_RDMA all=m
 NVME_FC all=m
 NVME_TCP all=m
+NVME_AUTH all=y
 
 #-
 #- *** FILE: drivers/nvme/target/Kconfig ***
@@ -8457,6 +8473,7 @@ NVME_TARGET_RDMA all=m
 NVME_TARGET_FC all=m
 NVME_TARGET_FCLOOP all=m
 NVME_TARGET_TCP all=m
+NVME_TARGET_AUTH all=y
 
 #-
 #- *** FILE: drivers/nvmem/Kconfig ***
@@ -8584,6 +8601,7 @@ PCI_ENDPOINT_CONFIGFS all=y
 #-
 PCI_EPF_TEST all=m
 PCI_EPF_NTB all=m
+PCI_EPF_VNTB all=m
 
 #-
 #- *** FILE: drivers/pci/hotplug/Kconfig ***
@@ -8874,6 +8892,7 @@ PINCTRL_ICELAKE all=m
 PINCTRL_JASPERLAKE all=m
 PINCTRL_LAKEFIELD all=m
 PINCTRL_LEWISBURG all=m
+PINCTRL_METEORLAKE all=m
 PINCTRL_SUNRISEPOINT all=m
 PINCTRL_TIGERLAKE all=m
 
@@ -8949,7 +8968,9 @@ SURFACE3_WMI all=m
 SURFACE_3_POWER_OPREGION all=m
 SURFACE_ACPI_NOTIFY all=m
 SURFACE_AGGREGATOR_CDEV all=m
+SURFACE_AGGREGATOR_HUB all=m
 SURFACE_AGGREGATOR_REGISTRY all=m
+SURFACE_AGGREGATOR_TABLET_SWITCH all=m
 SURFACE_DTX all=m
 SURFACE_GPE all=m
 SURFACE_HOTPLUG all=m
@@ -8980,8 +9001,7 @@ YOGABOOK_WMI all=m
 ACERHDF all=m
 ACER_WIRELESS all=m
 ACER_WMI all=m
-AMD_PMC all=m
-AMD_HSMP all=m
+#- file drivers/platform/x86/amd/Kconfig goes here
 ADV_SWBUTTON all=m
 APPLE_GMUX all=m
 ASUS_LAPTOP i386=m x86_64=m
@@ -9043,6 +9063,12 @@ INTEL_SCU_IPC_UTIL all=m
 SIEMENS_SIMATIC_IPC all=m
 WINMATE_FM07_KEYS all=m
 
+#-
+#- *** FILE: drivers/platform/x86/amd/Kconfig ***
+#-
+AMD_PMC all=m
+AMD_HSMP all=m
+
 #-
 #- *** FILE: drivers/platform/x86/dell/Kconfig ***
 #-
@@ -9321,6 +9347,7 @@ PWM_DEBUG all=n
 PWM_ATMEL_HLCDC_PWM arm=m arm64=m
 PWM_ATMEL_TCB arm=m arm64=m
 PWM_BCM2835 arm=m
+PWM_CLK all=m
 PWM_CROS_EC all=m
 PWM_DWC all=m
 PWM_FSL_FTM arm=m arm64=m
@@ -9508,6 +9535,7 @@ RESET_MESON arm64=m
 RESET_MESON_AUDIO_ARB arm64=m
 RESET_RASPBERRYPI arm=m
 RESET_TI_SYSCON all=m
+RESET_TI_TPS380X all=m
 #- file drivers/reset/sti/Kconfig goes here
 #- file drivers/reset/hisilicon/Kconfig goes here
 #- file drivers/reset/tegra/Kconfig goes here
@@ -9715,7 +9743,6 @@ SCSI_AACRAID all=m
 #- file drivers/scsi/hisi_sas/Kconfig goes here
 #- file drivers/scsi/mvsas/Kconfig goes here
 SCSI_MVUMI all=m
-SCSI_DPT_I2O all=m
 SCSI_ADVANSYS all=m
 SCSI_ARCMSR all=m sparc=n
 #- file drivers/scsi/esas2r/Kconfig goes here
@@ -10066,6 +10093,7 @@ SPI_FSL_SPI arm=m arm64=m
 SPI_FSL_DSPI all=m
 SPI_MESON_SPICC arm64=m
 SPI_MESON_SPIFC arm64=m
+SPI_MICROCHIP_CORE all=m
 SPI_LANTIQ_SSC all=m
 SPI_OC_TINY all=m
 SPI_ORION arm=m
@@ -10120,7 +10148,6 @@ STAGING all=y
 #- file drivers/staging/r8188eu/Kconfig goes here
 #- file drivers/staging/rts5208/Kconfig goes here
 #- file drivers/staging/octeon/Kconfig goes here
-#- file drivers/staging/octeon-usb/Kconfig goes here
 #- file drivers/staging/vt6655/Kconfig goes here
 #- file drivers/staging/vt6656/Kconfig goes here
 #- file drivers/staging/iio/Kconfig goes here
@@ -10298,17 +10325,18 @@ KS7010 all=m
 #-
 STAGING_MEDIA all=y
 #- file drivers/staging/media/atomisp/Kconfig goes here
+#- file drivers/staging/media/av7110/Kconfig goes here
 #- file drivers/staging/media/hantro/Kconfig goes here
 #- file drivers/staging/media/imx/Kconfig goes here
+#- file drivers/staging/media/ipu3/Kconfig goes here
 #- file drivers/staging/media/max96712/Kconfig goes here
 #- file drivers/staging/media/meson/vdec/Kconfig goes here
 #- file drivers/staging/media/omap4iss/Kconfig goes here
 #- file drivers/staging/media/rkvdec/Kconfig goes here
+#- file drivers/staging/media/stkwebcam/Kconfig goes here
 #- file drivers/staging/media/sunxi/Kconfig goes here
-#- file drivers/staging/media/zoran/Kconfig goes here
 #- file drivers/staging/media/tegra-video/Kconfig goes here
-#- file drivers/staging/media/ipu3/Kconfig goes here
-#- file drivers/staging/media/av7110/Kconfig goes here
+#- file drivers/staging/media/zoran/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/media/atomisp/Kconfig ***
@@ -10364,6 +10392,11 @@ VIDEO_MESON_VDEC arm64=m
 #-
 VIDEO_ROCKCHIP_VDEC arm64=m
 
+#-
+#- *** FILE: drivers/staging/media/stkwebcam/Kconfig ***
+#-
+VIDEO_STKWEBCAM all=m
+
 #-
 #- *** FILE: drivers/staging/media/zoran/Kconfig ***
 #-
@@ -10487,6 +10520,10 @@ BCM2835_VCHIQ_MMAL arm=m
 #-
 #- *** FILE: drivers/staging/vme_user/Kconfig ***
 #-
+VME_BUS all=y
+#- VME Bridge Drivers
+VME_TSI148 all=m
+VME_FAKE all=m
 #- VME Device Drivers
 VME_USER all=m
 
@@ -11264,6 +11301,7 @@ TYPEC all=m
 #- file drivers/usb/typec/tcpm/Kconfig goes here
 #- file drivers/usb/typec/ucsi/Kconfig goes here
 #- file drivers/usb/typec/tipd/Kconfig goes here
+TYPEC_ANX7411 all=m
 TYPEC_RT1719 all=m
 TYPEC_HD3SS3220 all=m
 TYPEC_STUSB160X all=m
@@ -11306,6 +11344,7 @@ TYPEC_TPS6598X all=m
 TYPEC_UCSI all=m
 UCSI_CCG all=m
 UCSI_ACPI all=m
+UCSI_STM32G0 all=m
 
 #-
 #- *** FILE: drivers/usb/usbip/Kconfig ***
@@ -11665,27 +11704,6 @@ VIRTIO_INPUT all=m
 VIRTIO_MMIO all=m
 VIRTIO_MMIO_CMDLINE_DEVICES all=y
 
-#-
-#- *** FILE: drivers/vme/Kconfig ***
-#-
-VME_BUS all=y
-#- file drivers/vme/bridges/Kconfig goes here
-#- file drivers/vme/boards/Kconfig goes here
-
-#-
-#- *** FILE: drivers/vme/boards/Kconfig ***
-#-
-#- VME Board Drivers
-VMIVME_7805 all=m
-
-#-
-#- *** FILE: drivers/vme/bridges/Kconfig ***
-#-
-#- VME Bridge Drivers
-VME_CA91CX42 all=m
-VME_TSI148 all=m
-VME_FAKE all=m
-
 #-
 #- *** FILE: drivers/w1/Kconfig ***
 #-
@@ -12091,6 +12109,7 @@ FS_ENCRYPTION_INLINE_CRYPT all=y
 #- *** FILE: fs/dlm/Kconfig ***
 #-
 DLM all=m
+DLM_DEPRECATED_API all=n
 DLM_DEBUG all=n
 
 #-
@@ -12650,6 +12669,7 @@ NUMA_BALANCING all=y
 NUMA_BALANCING_DEFAULT_ENABLED all=y
 CGROUPS all=y
 PAGE_COUNTER all=y
+CGROUP_FAVOR_DYNMODS all=n
 MEMCG all=y
 MEMCG_SWAP all=y
 BLK_CGROUP all=y
@@ -12717,30 +12737,7 @@ PROFILING all=y
 #- file arch/Kconfig goes here
 RT_MUTEXES all=y
 BASE_SMALL all=0
-MODULES all=y
-MODULE_FORCE_LOAD all=y
-MODULE_UNLOAD all=y
-MODULE_FORCE_UNLOAD all=y
-MODULE_UNLOAD_TAINT_TRACKING all=y
-MODVERSIONS all=y
-MODULE_SRCVERSION_ALL all=n
-MODULE_SIG all=y
-MODULE_SIG_FORCE all=n
-MODULE_SIG_ALL all=y
-#- Do not forget to sign required modules with scripts/sign-file
-MODULE_SIG_SHA1 all=y
-MODULE_SIG_SHA224 all=n
-MODULE_SIG_SHA256 all=n
-MODULE_SIG_SHA384 all=n
-MODULE_SIG_SHA512 all=n
-MODULE_COMPRESS_NONE all=n
-MODULE_COMPRESS_GZIP all=n
-MODULE_COMPRESS_XZ all=y
-MODULE_COMPRESS_ZSTD all=n
-MODULE_DECOMPRESS all=y
-MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS all=n
-MODPROBE_PATH="/sbin/modprobe"
-#- file tree. goes here
+#- file kernel/module/Kconfig goes here
 #- file block/Kconfig goes here
 #- file kernel/Kconfig.locks goes here
 
@@ -12813,6 +12810,34 @@ GENERIC_IRQ_DEBUGFS all=n
 #-
 LIVEPATCH all=y
 
+#-
+#- *** FILE: kernel/module/Kconfig ***
+#-
+MODULES all=y
+MODULE_FORCE_LOAD all=y
+MODULE_UNLOAD all=y
+MODULE_FORCE_UNLOAD all=y
+MODULE_UNLOAD_TAINT_TRACKING all=y
+MODVERSIONS all=y
+MODULE_SRCVERSION_ALL all=n
+MODULE_SIG all=y
+MODULE_SIG_FORCE all=n
+MODULE_SIG_ALL all=y
+#- Do not forget to sign required modules with scripts/sign-file
+MODULE_SIG_SHA1 all=y
+MODULE_SIG_SHA224 all=n
+MODULE_SIG_SHA256 all=n
+MODULE_SIG_SHA384 all=n
+MODULE_SIG_SHA512 all=n
+MODULE_COMPRESS_NONE all=n
+MODULE_COMPRESS_GZIP all=n
+MODULE_COMPRESS_XZ all=y
+MODULE_COMPRESS_ZSTD all=n
+MODULE_DECOMPRESS all=y
+MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS all=n
+MODPROBE_PATH="/sbin/modprobe"
+#- file tree. goes here
+
 #-
 #- *** FILE: kernel/power/Kconfig ***
 #-
@@ -12825,6 +12850,7 @@ PM_STD_PARTITION all=""
 PM_SLEEP all=y
 PM_SLEEP_SMP all=y
 PM_AUTOSLEEP all=y
+PM_USERSPACE_AUTOSLEEP all=n
 PM_WAKELOCKS all=y
 PM_WAKELOCKS_LIMIT all=100
 PM_WAKELOCKS_GC all=y
@@ -12915,6 +12941,16 @@ RING_BUFFER_VALIDATE_TIME_DELTAS all=n
 PREEMPTIRQ_DELAY_TEST all=m
 SYNTH_EVENT_GEN_TEST all=m
 KPROBE_EVENT_GEN_TEST all=m
+#- file kernel/trace/rv/Kconfig goes here
+
+#-
+#- *** FILE: kernel/trace/rv/Kconfig ***
+#-
+RV all=y
+RV_MON_WWNR all=y
+RV_REACTORS all=y
+RV_REACT_PRINTK all=y
+RV_REACT_PANIC all=y
 
 #-
 #- *** FILE: lib/Kconfig ***
@@ -12964,7 +13000,6 @@ GLOB_SELFTEST all=n
 IRQ_POLL arm=y arm64=y
 #- file lib/vdso/Kconfig goes here
 #- file lib/fonts/Kconfig goes here
-STACK_HASH_ORDER all=20
 
 #-
 #- *** FILE: lib/Kconfig.debug ***
@@ -13016,6 +13051,7 @@ DEBUG_FS_ALLOW_NONE all=n
 #- file net/Kconfig.debug goes here
 #- file mm/Kconfig.debug goes here
 DEBUG_OBJECTS all=n
+SHRINKER_DEBUG all=n
 DEBUG_KMEMLEAK all=n
 DEBUG_STACK_USAGE all=n
 SCHED_STACK_END_CHECK all=y
@@ -13327,6 +13363,7 @@ DAMON_PADDR all=y arm=n
 DAMON_SYSFS all=y
 DAMON_DBGFS all=y
 DAMON_RECLAIM all=y
+DAMON_LRU_SORT all=y
 
 #-
 #- *** FILE: net/6lowpan/Kconfig ***
@@ -13601,7 +13638,6 @@ CAN_BCM all=m
 CAN_GW all=m
 #- file net/can/j1939/Kconfig goes here
 CAN_ISOTP all=m
-#- file drivers/net/can/Kconfig goes here
 
 #-
 #- *** FILE: net/can/j1939/Kconfig ***
@@ -13671,6 +13707,7 @@ NET_DSA_TAG_OCELOT_8021Q all=m
 NET_DSA_TAG_QCA all=m
 NET_DSA_TAG_RTL4_A all=m
 NET_DSA_TAG_RTL8_4 all=m
+NET_DSA_TAG_RZN1_A5PSW all=m
 NET_DSA_TAG_LAN9303 all=m
 NET_DSA_TAG_SJA1105 all=m
 NET_DSA_TAG_TRAILER all=m
@@ -14007,6 +14044,7 @@ NFT_FIB_NETDEV all=m
 NFT_REJECT_NETDEV all=m
 NF_FLOW_TABLE_INET all=m
 NF_FLOW_TABLE all=m
+NF_FLOW_TABLE_PROCFS all=y
 NETFILTER_XTABLES all=m
 NETFILTER_XTABLES_COMPAT all=y
 #- Xtables combined modules
@@ -14506,9 +14544,12 @@ GCC_PLUGIN_RANDSTRUCT all=y
 #- *** FILE: security/apparmor/Kconfig ***
 #-
 SECURITY_APPARMOR=y
+SECURITY_APPARMOR_DEBUG all=n
+SECURITY_APPARMOR_INTROSPECT_POLICY all=y
 SECURITY_APPARMOR_HASH all=y
 SECURITY_APPARMOR_HASH_DEFAULT all=y
-SECURITY_APPARMOR_DEBUG all=n
+SECURITY_APPARMOR_EXPORT_BINARY all=y
+SECURITY_APPARMOR_PARANOID_LOAD all=y
 
 #-
 #- *** FILE: security/integrity/Kconfig ***
@@ -14704,6 +14745,7 @@ SND_SUPPORT_OLD_API all=y
 SND_VERBOSE_PROCFS all=y
 SND_VERBOSE_PRINTK all=n
 SND_DEBUG all=n
+SND_CTL_INPUT_VALIDATION all=y
 #- file sound/core/seq/Kconfig goes here
 
 #-
@@ -14990,6 +15032,7 @@ SND_SOC_ADI_AXI_SPDIF all=m
 SND_SOC_AMD_ACP all=m
 SND_SOC_AMD_CZ_DA7219MX98357_MACH all=m
 SND_SOC_AMD_CZ_RT5645_MACH all=m
+SND_SOC_AMD_ST_ES8336_MACH all=m
 SND_SOC_AMD_ACP3x all=m
 SND_SOC_AMD_RV_RT5682_MACH all=m
 SND_SOC_AMD_RENOIR all=m
@@ -15000,6 +15043,7 @@ SND_SOC_AMD_ACP6x all=m
 SND_SOC_AMD_YC_MACH all=m
 SND_AMD_ACP_CONFIG arm=m arm64=m
 #- file sound/soc/amd/acp/Kconfig goes here
+SND_SOC_AMD_RPL_ACP6x all=m
 
 #-
 #- *** FILE: sound/soc/amd/acp/Kconfig ***
@@ -15007,6 +15051,7 @@ SND_AMD_ACP_CONFIG arm=m arm64=m
 SND_SOC_AMD_ACP_COMMON all=m
 SND_SOC_AMD_ACP_PCI all=m
 SND_AMD_ASOC_RENOIR all=m
+SND_AMD_ASOC_REMBRANDT all=m
 SND_SOC_AMD_LEGACY_MACH all=m
 SND_SOC_AMD_SOF_MACH all=m
 
@@ -15021,9 +15066,6 @@ SND_SOC_MIKROE_PROTO arm=m arm64=m
 #-
 SND_BCM2835_SOC_I2S arm=m
 SND_BCM63XX_I2S_WHISTLER all=m
-SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
-SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
-SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
 
 #-
 #- *** FILE: sound/soc/codecs/Kconfig ***
@@ -15157,6 +15199,7 @@ SND_SOC_TAS2552 all=m
 SND_SOC_TAS2562 all=m
 SND_SOC_TAS2764 all=m
 SND_SOC_TAS2770 all=m
+SND_SOC_TAS2780 all=m
 SND_SOC_TAS5086 all=m
 SND_SOC_TAS571X all=m
 SND_SOC_TAS5720 all=m
@@ -15213,6 +15256,7 @@ SND_SOC_WM8978 all=m
 SND_SOC_WM8985 all=m
 SND_SOC_WM8991 all=m
 SND_SOC_WSA881X all=m
+SND_SOC_WSA883X all=m
 SND_SOC_ZL38060 all=m
 SND_SOC_LM4857 all=m
 SND_SOC_MAX9759 all=m
@@ -15301,8 +15345,26 @@ SND_SOC_INTEL_CML_LP all=m
 SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC all=y
 SND_SOC_INTEL_KEEMBAY arm64=m
 SND_SOC_INTEL_AVS all=m
+#- file sound/soc/intel/avs/boards/Kconfig goes here
 #- file sound/soc/intel/boards/Kconfig goes here
 
+#-
+#- *** FILE: sound/soc/intel/avs/boards/Kconfig ***
+#-
+#- Available DSP configurations
+SND_SOC_INTEL_AVS_MACH_DA7219 all=m
+SND_SOC_INTEL_AVS_MACH_DMIC all=m
+SND_SOC_INTEL_AVS_MACH_HDAUDIO all=m
+SND_SOC_INTEL_AVS_MACH_I2S_TEST all=m
+SND_SOC_INTEL_AVS_MACH_MAX98357A all=m
+SND_SOC_INTEL_AVS_MACH_MAX98373 all=m
+SND_SOC_INTEL_AVS_MACH_NAU8825 all=m
+SND_SOC_INTEL_AVS_MACH_RT274 all=m
+SND_SOC_INTEL_AVS_MACH_RT286 all=m
+SND_SOC_INTEL_AVS_MACH_RT298 all=m
+SND_SOC_INTEL_AVS_MACH_RT5682 all=m
+SND_SOC_INTEL_AVS_MACH_SSM4567 all=m
+
 #-
 #- *** FILE: sound/soc/intel/boards/Kconfig ***
 #-
@@ -15439,6 +15501,7 @@ SND_SOC_SOF_JASPERLAKE all=m
 SND_SOC_SOF_TIGERLAKE all=m
 SND_SOC_SOF_ELKHARTLAKE all=m
 SND_SOC_SOF_ALDERLAKE all=m
+SND_SOC_SOF_METEORLAKE all=m
 SND_SOC_SOF_HDA_LINK all=y
 SND_SOC_SOF_HDA_AUDIO_CODEC all=y
 SND_SOC_SOF_INTEL_SOUNDWIRE all=m
@@ -15531,3 +15594,25 @@ RD_XZ all=y
 RD_LZO all=y
 RD_LZ4 all=y
 RD_ZSTD all=y
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+ANDROID all=n
+BLK_DEV_SX8 all=m
+CAN_ESD_USB2 all=m
+EFI_VARS all=m
+NET_DSA_MICROCHIP_KSZ8795 all=m
+NET_DSA_MICROCHIP_KSZ8795_SPI all=m
+NET_DSA_MICROCHIP_KSZ9477 all=m
+NET_DSA_MICROCHIP_KSZ9477_SPI all=m
+SCSI_DPT_I2O all=m
+SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
+SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
+SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
+STACK_HASH_ORDER all=20
+USB_STKWEBCAM all=m
+VME_CA91CX42 all=m
+VMIVME_7805 all=m
+VXGE all=m
+VXGE_DEBUG_TRACE_ALL all=n
diff --git a/kernel.spec b/kernel.spec
index dad22a34..562aa6c0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -65,9 +65,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
-%define		basever		5.19
-%define		postver		.12
+%define		rel		0.1
+%define		basever		6.0
+%define		postver		.0
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -117,10 +117,10 @@ Release:	%{rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5:	f91bfe133d2cb1692f705947282e123a
+Source0:	https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
+# Source0-md5:	d681bd1d62d48049a4874646f6774d92
 %if "%{postver}" != ".0"
-Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
+Patch0:		https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
 # Patch0-md5:	2f9945a50613017d430f7091be9939f8
 %endif
 Source1:	kernel.sysconfig