[packages/kernel] up to 6.9.0

atler atler at pld-linux.org
Mon May 13 20:02:13 CEST 2024


commit 231d2c8389f6d06a167a79d8ad085316a206a611
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon May 13 19:08:29 2024 +0200

    up to 6.9.0

 android-enable-building-binder-as-module.patch |   8 +-
 kernel-aufs.patch                              | 371 +++++++++++++------------
 kernel-multiarch.config                        | 193 ++++++++-----
 kernel-pom-ng-IPV4OPTSSTRIP.patch              |   4 +-
 kernel-x86.config                              |  20 +-
 kernel.spec                                    |   6 +-
 6 files changed, 342 insertions(+), 260 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index dd9c5c5c..55827ab5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -52,8 +52,8 @@
 %endif
 
 %define		rel		1
-%define		basever		6.8
-%define		postver		.9
+%define		basever		6.9
+%define		postver		.0
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -104,7 +104,7 @@ Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
-# Source0-md5:	72d623b959a11850b57406f0b9fe3946
+# Source0-md5:	b9828ed78dae306e3d90643cd5cdb8f1
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
 # Patch0-md5:	dc5d54c8f0e01412d18a520ff3f95a06
diff --git a/android-enable-building-binder-as-module.patch b/android-enable-building-binder-as-module.patch
index dced780e..a3142c70 100644
--- a/android-enable-building-binder-as-module.patch
+++ b/android-enable-building-binder-as-module.patch
@@ -67,7 +67,7 @@
 +++ b/security/security.c
 @@ -798,6 +798,7 @@ int security_binder_set_context_mgr(cons
  {
- 	return call_int_hook(binder_set_context_mgr, 0, mgr);
+ 	return call_int_hook(binder_set_context_mgr, mgr);
  }
 +EXPORT_SYMBOL_GPL(security_binder_set_context_mgr);
  
@@ -75,7 +75,7 @@
   * security_binder_transaction() - Check if a binder transaction is allowed
 @@ -813,6 +814,7 @@ int security_binder_transaction(const st
  {
- 	return call_int_hook(binder_transaction, 0, from, to);
+ 	return call_int_hook(binder_transaction, from, to);
  }
 +EXPORT_SYMBOL_GPL(security_binder_transaction);
  
@@ -83,7 +83,7 @@
   * security_binder_transfer_binder() - Check if a binder transfer is allowed
 @@ -828,6 +830,7 @@ int security_binder_transfer_binder(cons
  {
- 	return call_int_hook(binder_transfer_binder, 0, from, to);
+ 	return call_int_hook(binder_transfer_binder, from, to);
  }
 +EXPORT_SYMBOL_GPL(security_binder_transfer_binder);
  
@@ -91,7 +91,7 @@
   * security_binder_transfer_file() - Check if a binder file xfer is allowed
 @@ -844,6 +847,7 @@ int security_binder_transfer_file(const
  {
- 	return call_int_hook(binder_transfer_file, 0, from, to, file);
+ 	return call_int_hook(binder_transfer_file, from, to, file);
  }
 +EXPORT_SYMBOL_GPL(security_binder_transfer_file);
  
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index dcdb3f87..437a336e 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs6.x-rcN kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
-index 89fdbefd1075..0038eb501478 100644
+index a46b0cbc4d8f..d90a3b0dbc53 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -338,6 +338,7 @@ source "fs/sysv/Kconfig"
+@@ -337,6 +337,7 @@ source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
  source "fs/erofs/Kconfig"
  source "fs/vboxsf/Kconfig"
@@ -14,10 +14,10 @@ index 89fdbefd1075..0038eb501478 100644
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
-index c09016257f05..3899fae66d3f 100644
+index 6ecc9b0a53f2..255420c2676e 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -130,3 +130,4 @@ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
+@@ -129,3 +129,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
 aufs6.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 9ed4d3868539..c0f45969bcf8 100644
+index aa3b947fb080..fb7020b24f7c 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3365,6 +3365,19 @@ F:	kernel/audit*
+@@ -3396,6 +3396,19 @@ F:	kernel/audit*
  F:	lib/*audit.c
  K:	\baudit_[a-z_0-9]\+\b
  
@@ -50,10 +50,10 @@ index 9ed4d3868539..c0f45969bcf8 100644
  M:	Greg Kroah-Hartman <gregkh at linuxfoundation.org>
  R:	Dave Ertman <david.m.ertman at intel.com>
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index f8145499da38..333b3915fe86 100644
+index 28a95fd366fe..6bd18fb1e53a 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -641,6 +641,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -641,6 +641,26 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	goto done;
  }
  
@@ -61,6 +61,8 @@ index f8145499da38..333b3915fe86 100644
 + * for AUFS
 + * no get/put for file.
 + */
++/* Just to make the compiler silence, declare it */
++struct file *loop_backing_file(struct super_block *sb);
 +struct file *loop_backing_file(struct super_block *sb)
 +{
 +	struct file *ret;
@@ -79,10 +81,20 @@ index f8145499da38..333b3915fe86 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index b813528fb147..78e322b59b8d 100644
+index 71a8e943a0fa..13afe5474f86 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1219,7 +1219,7 @@ enum d_walk_ret {
+@@ -1211,6 +1211,9 @@ enum d_walk_ret {
+ 	D_WALK_SKIP,
+ };
+ 
++/* AUFS calls d_walk(). Just to make the compiler silence, declare it */
++void d_walk(struct dentry *parent, void *data,
++		   enum d_walk_ret (*enter)(void *, struct dentry *));
+ /**
+  * d_walk - walk the dentry tree
+  * @parent:	start of walk
+@@ -1219,7 +1222,7 @@ enum d_walk_ret {
   *
   * The @enter() callbacks are called with d_lock held.
   */
@@ -92,10 +104,10 @@ index b813528fb147..78e322b59b8d 100644
  {
  	struct dentry *this_parent, *dentry;
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index c80a6acad742..96a562b48ec7 100644
+index 54cc85d3338e..5dcfe97a5ba5 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  
  #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
  
@@ -104,7 +116,7 @@ index c80a6acad742..96a562b48ec7 100644
  {
  	struct inode * inode = file_inode(filp);
  	int error = 0;
-@@ -64,6 +64,8 @@ static int setfl(int fd, struct file * filp, unsigned int arg)
+@@ -65,6 +65,8 @@ static int setfl(int fd, struct file * filp, unsigned int arg)
  
  	if (filp->f_op->check_flags)
  		error = filp->f_op->check_flags(arg);
@@ -144,10 +156,10 @@ index 218e24b1ac40..7210ddc5aa81 100644
  {
  	if (unlikely(!out->f_op->splice_write))
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 023f37c60709..96ca249ee1e6 100644
+index 00fc429b0af0..b3a73aed62b8 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1104,6 +1104,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1113,6 +1113,7 @@ extern void fasync_free(struct fasync_struct *);
  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  
@@ -155,7 +167,7 @@ index 023f37c60709..96ca249ee1e6 100644
  extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
  extern int f_setown(struct file *filp, int who, int force);
  extern void f_delown(struct file *filp);
-@@ -2001,6 +2002,7 @@ struct file_operations {
+@@ -2024,6 +2025,7 @@ struct file_operations {
  	int (*lock) (struct file *, int, struct file_lock *);
  	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
  	int (*check_flags)(int);
@@ -233,10 +245,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs6.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 98a031ac2648..a7a2ff2a7f61 100644
+index 18550c071d71..560be8fb4fca 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2215,7 +2215,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2213,7 +2213,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) {
@@ -262,7 +274,7 @@ index c6e7ebc63756..d7ccfd909764 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 3f78ebbb795f..f96ec77db39e 100644
+index 23fbab954c20..6faced8ef8fe 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -273,7 +273,8 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@@ -275,7 +287,7 @@ index 3f78ebbb795f..f96ec77db39e 100644
  
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
-@@ -2701,7 +2702,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -2700,7 +2701,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;
@@ -301,10 +313,10 @@ index bce674533000..b12b5a75c799 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 f5a97dec5169..a5b0edc8e290 100644
+index 0436b919f1c7..a04c7dde4bc2 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -2432,6 +2432,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -2452,6 +2452,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
  static inline struct vm_area_struct *vma_lookup(struct mm_struct *mm,
  						unsigned long addr);
  
@@ -349,10 +361,10 @@ index f5a97dec5169..a5b0edc8e290 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 8b611e13153e..838af328941a 100644
+index 5240bd7bca33..f91323e92ef9 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -527,6 +527,9 @@ struct vm_region {
+@@ -555,6 +555,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 */
@@ -362,7 +374,7 @@ index 8b611e13153e..838af328941a 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
-@@ -691,6 +694,9 @@ struct vm_area_struct {
+@@ -719,6 +722,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). */
@@ -373,10 +385,10 @@ index 8b611e13153e..838af328941a 100644
  
  #ifdef CONFIG_ANON_VMA_NAME
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 0d944e92a43f..bc073aaca2dc 100644
+index 39a5046c2f0b..478a22f5f367 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -716,7 +716,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -718,7 +718,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
  		if (file) {
  			struct address_space *mapping = file->f_mapping;
  
@@ -395,10 +407,10 @@ index e4b5b75aaec9..2ec2544009fb 100644
  obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o
 +obj-y += prfile.o
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 750e779c23db..b84a752ff676 100644
+index 7437b2bd75c1..cecf1956f7a9 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -3587,7 +3587,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -3631,7 +3631,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);
@@ -408,7 +420,7 @@ index 750e779c23db..b84a752ff676 100644
  	if (folio->mapping != mapping) {
  		folio_unlock(folio);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index d89770eaab6b..6bfba84b5ff0 100644
+index 6dbda99a47da..8610432aa357 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -140,7 +140,7 @@ static void remove_vma(struct vm_area_struct *vma, bool unreachable)
@@ -420,7 +432,7 @@ index d89770eaab6b..6bfba84b5ff0 100644
  	mpol_put(vma_policy(vma));
  	if (unreachable)
  		__vm_area_free(vma);
-@@ -554,7 +554,7 @@ static inline void vma_complete(struct vma_prepare *vp,
+@@ -557,7 +557,7 @@ static inline void vma_complete(struct vma_prepare *vp,
  		if (vp->file) {
  			uprobe_munmap(vp->remove, vp->remove->vm_start,
  				      vp->remove->vm_end);
@@ -429,7 +441,7 @@ index d89770eaab6b..6bfba84b5ff0 100644
  		}
  		if (vp->remove->anon_vma)
  			anon_vma_merge(vp->vma, vp->remove);
-@@ -2357,7 +2357,7 @@ static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
+@@ -2361,7 +2361,7 @@ static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
  		goto out_free_mpol;
  
  	if (new->vm_file)
@@ -438,7 +450,7 @@ index d89770eaab6b..6bfba84b5ff0 100644
  
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
-@@ -2855,7 +2855,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -2854,7 +2854,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  				 * and cause general protection fault
  				 * ultimately.
  				 */
@@ -447,7 +459,7 @@ index d89770eaab6b..6bfba84b5ff0 100644
  				vm_area_free(vma);
  				vma = merge;
  				/* Update vm_flags to pick up the change. */
-@@ -2950,7 +2950,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -2940,7 +2940,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  
  	if (file || vma->vm_file) {
  unmap_and_free_vma:
@@ -456,7 +468,7 @@ index d89770eaab6b..6bfba84b5ff0 100644
  		vma->vm_file = NULL;
  
  		vma_iter_set(&vmi, vma->vm_end);
-@@ -3012,6 +3012,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -3002,6 +3002,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  	unsigned long populate = 0;
  	unsigned long ret = -EINVAL;
  	struct file *file;
@@ -466,7 +478,7 @@ index d89770eaab6b..6bfba84b5ff0 100644
  
  	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/mm/remap_file_pages.rst.\n",
  		     current->comm, current->pid);
-@@ -3070,10 +3073,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -3060,10 +3063,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  	if (vma->vm_flags & VM_LOCKED)
  		flags |= MAP_LOCKED;
  
@@ -501,7 +513,7 @@ index d89770eaab6b..6bfba84b5ff0 100644
  out:
  	mmap_write_unlock(mm);
  	if (populate)
-@@ -3420,7 +3447,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3406,7 +3433,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)
@@ -510,7 +522,7 @@ index d89770eaab6b..6bfba84b5ff0 100644
  		if (new_vma->vm_ops && new_vma->vm_ops->open)
  			new_vma->vm_ops->open(new_vma);
  		if (vma_link(mm, new_vma))
-@@ -3434,7 +3461,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3420,7 +3447,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
  		new_vma->vm_ops->close(new_vma);
  
  	if (new_vma->vm_file)
@@ -520,10 +532,10 @@ index d89770eaab6b..6bfba84b5ff0 100644
  	unlink_anon_vmas(new_vma);
  out_free_mempol:
 diff --git a/mm/nommu.c b/mm/nommu.c
-index b6dc558d3144..d96655486468 100644
+index 5ec8f44e7ce9..efda87a7f99a 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -523,7 +523,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -521,7 +521,7 @@ static void __put_nommu_region(struct vm_region *region)
  		up_write(&nommu_region_sem);
  
  		if (region->vm_file)
@@ -532,7 +544,7 @@ index b6dc558d3144..d96655486468 100644
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -603,7 +603,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -601,7 +601,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
@@ -541,7 +553,7 @@ index b6dc558d3144..d96655486468 100644
  	put_nommu_region(vma->vm_region);
  	vm_area_free(vma);
  }
-@@ -1135,7 +1135,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1133,7 +1133,7 @@ unsigned long do_mmap(struct file *file,
  					goto error_just_free;
  				}
  			}
@@ -550,7 +562,7 @@ index b6dc558d3144..d96655486468 100644
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1221,10 +1221,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1219,10 +1219,10 @@ unsigned long do_mmap(struct file *file,
  error:
  	vma_iter_free(&vmi);
  	if (region->vm_file)
@@ -659,10 +671,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs6.x-rcN standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 78e322b59b8d..7d8fbe5b7ce5 100644
+index 13afe5474f86..05d9dab666bb 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1318,6 +1318,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1321,6 +1321,7 @@ void d_walk(struct dentry *parent, void *data,
  	seq = 1;
  	goto again;
  }
@@ -670,7 +682,7 @@ index 78e322b59b8d..7d8fbe5b7ce5 100644
  
  struct check_mount {
  	struct vfsmount *mnt;
-@@ -2880,6 +2881,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2883,6 +2884,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
  
  	write_sequnlock(&rename_lock);
  }
@@ -679,7 +691,7 @@ index 78e322b59b8d..7d8fbe5b7ce5 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index af4fbb61cd53..aa5161ad2c1f 100644
+index ff6f26671cfc..ea7aa14a730e 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -113,6 +113,7 @@ bool path_noexec(const struct path *path)
@@ -691,10 +703,10 @@ index af4fbb61cd53..aa5161ad2c1f 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 96a562b48ec7..e21a0fcff538 100644
+index 5dcfe97a5ba5..48adde670824 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -87,6 +87,7 @@ int setfl(int fd, struct file * filp, unsigned int arg)
+@@ -88,6 +88,7 @@ int setfl(int fd, struct file * filp, unsigned int arg)
   out:
  	return error;
  }
@@ -703,10 +715,10 @@ index 96a562b48ec7..e21a0fcff538 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 b991f90571b4..a3ba5726194a 100644
+index 4f03beed4737..1f0527dad5e1 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
-@@ -222,6 +222,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
+@@ -221,6 +221,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
  	}
  	return ERR_PTR(-ENFILE);
  }
@@ -763,10 +775,10 @@ 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 a84d21e55c39..35183a95dafd 100644
+index ee8460c83c77..cb296bf7770f 100644
 --- a/fs/open.c
 +++ b/fs/open.c
-@@ -67,6 +67,7 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry,
+@@ -66,6 +66,7 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry,
  	inode_unlock(dentry->d_inode);
  	return ret;
  }
@@ -807,10 +819,10 @@ index 7210ddc5aa81..9e83f46eacc8 100644
  /*
   * Indicate to the caller that there was a premature EOF when reading from the
 diff --git a/fs/xattr.c b/fs/xattr.c
-index 09d927603433..890daee95a7b 100644
+index f8b643f91a98..9a2d9b3aaf0a 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
-@@ -406,6 +406,7 @@ vfs_getxattr_alloc(struct mnt_idmap *idmap, struct dentry *dentry,
+@@ -405,6 +405,7 @@ vfs_getxattr_alloc(struct mnt_idmap *idmap, struct dentry *dentry,
  	*xattr_value = value;
  	return error;
  }
@@ -840,68 +852,68 @@ index 95a7e1b7f1da..5053670775d3 100644
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/security.c b/security/security.c
-index 7035ee35a393..eb461a68073f 100644
+index 7e118858b545..4b5bbe8c6889 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -1835,6 +1835,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -1840,6 +1840,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
  		return 0;
- 	return call_int_hook(path_rmdir, 0, dir, dentry);
+ 	return call_int_hook(path_rmdir, dir, dentry);
  }
 +EXPORT_SYMBOL_GPL(security_path_rmdir);
  
  /**
   * security_path_unlink() - Check if removing a hard link is allowed
-@@ -1870,6 +1871,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1875,6 +1876,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
  		return 0;
- 	return call_int_hook(path_symlink, 0, dir, dentry, old_name);
+ 	return call_int_hook(path_symlink, dir, dentry, old_name);
  }
 +EXPORT_SYMBOL_GPL(security_path_symlink);
  
  /**
   * security_path_link - Check if creating a hard link is allowed
-@@ -1888,6 +1890,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1893,6 +1895,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		return 0;
- 	return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
+ 	return call_int_hook(path_link, old_dentry, new_dir, new_dentry);
  }
 +EXPORT_SYMBOL_GPL(security_path_link);
  
  /**
   * security_path_rename() - Check if renaming a file is allowed
-@@ -1949,6 +1952,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1954,6 +1957,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
  		return 0;
- 	return call_int_hook(path_chmod, 0, path, mode);
+ 	return call_int_hook(path_chmod, path, mode);
  }
 +EXPORT_SYMBOL_GPL(security_path_chmod);
  
  /**
   * security_path_chown() - Check if changing the file's owner/group is allowed
-@@ -1966,6 +1970,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1971,6 +1975,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  		return 0;
- 	return call_int_hook(path_chown, 0, path, uid, gid);
+ 	return call_int_hook(path_chown, path, uid, gid);
  }
 +EXPORT_SYMBOL_GPL(security_path_chown);
  
  /**
   * security_path_chroot() - Check if changing the root directory is allowed
-@@ -2195,6 +2200,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -2215,6 +2220,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
- 	return call_int_hook(inode_permission, 0, inode, mask);
+ 	return call_int_hook(inode_permission, inode, mask);
  }
 +EXPORT_SYMBOL_GPL(security_inode_permission);
  
  /**
   * security_inode_setattr() - Check if setting file attributes is allowed
-@@ -2667,6 +2673,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -2694,6 +2700,7 @@ int security_file_permission(struct file *file, int mask)
  {
- 	return call_int_hook(file_permission, 0, file, mask);
+ 	return call_int_hook(file_permission, file, mask);
  }
 +EXPORT_SYMBOL_GPL(security_file_permission);
  
  /**
   * security_file_alloc() - Allocate and init a file's LSM blob
-@@ -2951,6 +2958,7 @@ int security_file_truncate(struct file *file)
+@@ -2996,6 +3003,7 @@ int security_file_truncate(struct file *file)
  {
- 	return call_int_hook(file_truncate, 0, file);
+ 	return call_int_hook(file_truncate, file);
  }
 +EXPORT_SYMBOL_GPL(security_file_truncate);
  
@@ -909,7 +921,7 @@ index 7035ee35a393..eb461a68073f 100644
   * security_task_alloc() - Allocate a task's LSM blob
 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-11-05 23:02:18.955889283 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,55 @@
 +What:		/debug/aufs/si_<id>/
 +Date:		March 2009
@@ -968,7 +980,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-11-05 23:02:18.955889283 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,31 @@
 +What:		/sys/fs/aufs/si_<id>/
 +Date:		March 2009
@@ -1003,7 +1015,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-11-05 23:02:18.955889283 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,171 @@
 +
 +# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1178,7 +1190,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-11-05 23:02:18.955889283 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,258 @@
 +
 +# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1440,7 +1452,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-11-05 23:02:18.955889283 +0100
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,85 @@
 +
 +# Copyright (C) 2015-2022 Junjiro R. Okajima
@@ -1529,7 +1541,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,113 @@
 +
 +# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1646,7 +1658,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,74 @@
 +
 +# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1724,7 +1736,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,64 @@
 +
 +# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -1792,7 +1804,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,44 @@
 +
 +// to view this graph, run dot(1) command in GRAPHVIZ.
@@ -1840,7 +1852,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,102 @@
 +
 +# Copyright (C) 2017-2022 Junjiro R. Okajima
@@ -1946,7 +1958,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,118 @@
 +
 +# Copyright (C) 2011-2022 Junjiro R. Okajima
@@ -2068,7 +2080,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,72 @@
 +
 +# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -2144,7 +2156,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,94 @@
 +
 +# Copyright (C) 2014-2022 Junjiro R. Okajima
@@ -2242,7 +2254,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,58 @@
 +
 +# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -2304,7 +2316,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,52 @@
 +
 +# Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -2360,7 +2372,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-11-05 23:02:18.959222617 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,47 @@
 +
 +# Copyright (C) 2010-2022 Junjiro R. Okajima
@@ -2411,7 +2423,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	2023-09-02 12:00:06.376642958 +0200
++++ linux/Documentation/filesystems/aufs/README	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,409 @@
 +
 +Aufs6 -- advanced multi layered unification filesystem version 6.x
@@ -2824,7 +2836,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-11-05 23:02:18.959222617 +0100
++++ linux/fs/aufs/aufs.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,62 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -2890,7 +2902,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	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/branch.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,1427 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -4321,7 +4333,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	2023-10-31 09:31:04.196547417 +0100
++++ linux/fs/aufs/branch.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,375 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -4700,7 +4712,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-11-05 23:02:18.959222617 +0100
++++ linux/fs/aufs/conf.mk	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,40 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -4744,7 +4756,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	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/cpup.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,1459 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -6207,7 +6219,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	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/cpup.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,100 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -6311,7 +6323,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	2023-10-10 22:51:18.033248030 +0200
++++ linux/fs/aufs/dbgaufs.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,526 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -6841,7 +6853,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-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dbgaufs.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,53 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -6898,7 +6910,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-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dcsub.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,225 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -7127,7 +7139,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-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dcsub.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,137 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -7268,7 +7280,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	2023-10-31 09:31:04.196547417 +0100
++++ linux/fs/aufs/debug.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,448 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -7720,7 +7732,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-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/debug.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,226 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -7950,7 +7962,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	2023-10-31 09:31:04.196547417 +0100
++++ linux/fs/aufs/dentry.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,1168 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -9122,7 +9134,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	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/dentry.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,270 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -9396,7 +9408,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-12-17 09:21:34.796521861 +0100
++++ linux/fs/aufs/dinfo.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,555 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -9955,8 +9967,8 @@ 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	2024-03-10 23:40:47.083143450 +0100
-@@ -0,0 +1,767 @@
++++ linux/fs/aufs/dir.c	2024-05-13 17:13:00.618070924 +0200
+@@ -0,0 +1,766 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -10521,8 +10533,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +	arg->err = 0;
 +	au_fset_testempty(arg->flags, CALLED);
 +	/* smp_mb(); */
-+	if (name[0] == '.'
-+	    && (namelen == 1 || (name[1] == '.' && namelen == 2)))
++	if (is_dot_dotdot(name, namelen))
 +		goto out; /* success */
 +
 +	if (namelen <= AUFS_WH_PFX_LEN
@@ -10726,7 +10737,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-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dir.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,134 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -10864,7 +10875,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	2023-10-10 22:51:18.033248030 +0200
++++ linux/fs/aufs/dirren.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,1315 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -12183,7 +12194,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-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dirren.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,140 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -12327,7 +12338,7 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
 +#endif /* __AUFS_DIRREN_H__ */
 diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 --- /usr/share/empty/fs/aufs/dynop.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/dynop.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,366 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -12697,7 +12708,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-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dynop.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,77 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -12778,7 +12789,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	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/export.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,846 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -13628,7 +13639,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-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/fhsm.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,426 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -14058,7 +14069,7 @@ 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	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/file.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,865 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -14927,7 +14938,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/file.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,342 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -15273,7 +15284,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/finfo.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,149 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -15426,7 +15437,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	2023-10-31 09:31:04.196547417 +0100
++++ linux/fs/aufs/f_op.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,771 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -16201,7 +16212,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/fsctx.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,1242 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -17447,7 +17458,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/fstype.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,401 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -17852,7 +17863,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/hbl.h	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,65 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -17921,7 +17932,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/hfsnotify.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,290 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -18215,7 +18226,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/hfsplus.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,60 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -18279,7 +18290,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	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/hnotify.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,715 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -18998,7 +19009,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/iinfo.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,286 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -19288,7 +19299,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	2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/inode.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,531 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -19823,7 +19834,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/inode.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,707 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -20534,7 +20545,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/ioctl.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,220 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -20758,7 +20769,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	2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/i_op_add.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,972 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -21734,7 +21745,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	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/i_op.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,1520 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -23258,7 +23269,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	2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/i_op_del.c	2024-05-13 17:13:00.618070924 +0200
 @@ -0,0 +1,523 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -23785,7 +23796,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	2024-03-10 23:40:47.083143450 +0100
++++ linux/fs/aufs/i_op_ren.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,1264 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -25053,7 +25064,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-11-05 23:02:18.959222617 +0100
++++ linux/fs/aufs/Kconfig	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,199 @@
 +# SPDX-License-Identifier: GPL-2.0
 +config AUFS_FS
@@ -25256,7 +25267,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/lcnt.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,186 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -25446,7 +25457,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/loop.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,148 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -25598,7 +25609,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/loop.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,55 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -25657,7 +25668,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/magic.mk	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,31 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -25692,7 +25703,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-11-05 23:02:18.959222617 +0100
++++ linux/fs/aufs/Makefile	2024-05-13 17:13:00.614737564 +0200
 @@ -0,0 +1,46 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -25742,7 +25753,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-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/module.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,273 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -26019,7 +26030,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-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/module.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,180 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -26152,7 +26163,7 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 +
 +extern struct kmem_cache *au_cache[AuCache_Last];
 +
-+#define AuCacheFlags		(SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD)
++#define AuCacheFlags		SLAB_RECLAIM_ACCOUNT
 +#define AuCache(type)		KMEM_CACHE(type, AuCacheFlags)
 +#define AuCacheCtor(type, ctor)	\
 +	kmem_cache_create(#type, sizeof(struct type), \
@@ -26203,7 +26214,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/mvdown.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,713 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -26920,7 +26931,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/opts.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,1032 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -27956,7 +27967,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/opts.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,263 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -28223,7 +28234,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-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/plink.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,516 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28743,7 +28754,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-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/poll.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,51 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28798,7 +28809,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	2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/posix_acl.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,108 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -28910,7 +28921,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-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/procfs.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,170 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -29084,7 +29095,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/rdu.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,384 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -29472,7 +29483,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-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/rwsem.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,85 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -29561,7 +29572,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-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/sbinfo.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,316 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -29881,7 +29892,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	2023-10-10 22:51:18.033248030 +0200
++++ linux/fs/aufs/super.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,871 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -30756,7 +30767,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/super.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,592 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -31352,7 +31363,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	2023-10-10 22:51:18.033248030 +0200
++++ linux/fs/aufs/sysaufs.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,94 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -31450,7 +31461,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-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/sysaufs.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,102 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -31556,7 +31567,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-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/sysfs.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,374 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -31934,7 +31945,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	2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/sysrq.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,149 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -32087,7 +32098,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/vdir.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,896 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -32987,7 +32998,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/vfsub.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,921 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -33912,7 +33923,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 --- /usr/share/empty/fs/aufs/vfsub.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/vfsub.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,402 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -34318,7 +34329,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/wbr_policy.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,830 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -35152,7 +35163,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	2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/whout.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,1072 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -36228,7 +36239,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	2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/whout.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,87 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -36319,7 +36330,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-11-05 23:02:18.972555950 +0100
++++ linux/fs/aufs/wkq.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,372 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -36695,7 +36706,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/wkq.h	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,89 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -36788,7 +36799,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
 +#endif /* __AUFS_WKQ_H__ */
 diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 --- /usr/share/empty/fs/aufs/xattr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c	2024-03-10 23:40:47.086476782 +0100
++++ linux/fs/aufs/xattr.c	2024-05-13 17:13:00.621404284 +0200
 @@ -0,0 +1,360 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -37152,7 +37163,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	2023-10-31 09:31:04.203214083 +0100
++++ linux/fs/aufs/xino.c	2024-05-13 17:13:00.624737645 +0200
 @@ -0,0 +1,1926 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -39082,7 +39093,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	2024-03-10 23:40:47.086476782 +0100
++++ linux/include/uapi/linux/aufs_type.h	2024-05-13 17:13:00.624737645 +0200
 @@ -0,0 +1,452 @@
 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +/*
@@ -39126,7 +39137,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +#include <limits.h>
 +#endif /* __KERNEL__ */
 +
-+#define AUFS_VERSION	"6.x-rcN-20240226"
++#define AUFS_VERSION	"6.x-rcN-20240401"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39540,7 +39551,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs6.x-rcN loopback patch
 
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 333b3915fe86..1eb5bde57477 100644
+index 6bd18fb1e53a..a93fab1797e2 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -54,7 +54,7 @@ struct loop_device {
@@ -39622,7 +39633,7 @@ index 333b3915fe86..1eb5bde57477 100644
  	goto done;
  }
  
-@@ -1009,6 +1032,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1014,6 +1037,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
  			  const struct loop_config *config)
  {
  	struct file *file = fget(config->fd);
@@ -39630,7 +39641,7 @@ index 333b3915fe86..1eb5bde57477 100644
  	struct inode *inode;
  	struct address_space *mapping;
  	int error;
-@@ -1024,6 +1048,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1029,6 +1053,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
  	/* This is safe, since we have a reference from open(). */
  	__module_get(THIS_MODULE);
  
@@ -39644,7 +39655,7 @@ index 333b3915fe86..1eb5bde57477 100644
  	/*
  	 * If we don't hold exclusive handle for the device, upgrade to it
  	 * here to avoid changing device under exclusive owner.
-@@ -1087,6 +1118,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1092,6 +1123,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
  	lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
  	lo->lo_device = bdev;
  	lo->lo_backing_file = file;
@@ -39652,7 +39663,7 @@ index 333b3915fe86..1eb5bde57477 100644
  	lo->old_gfp_mask = mapping_gfp_mask(mapping);
  	mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
  
-@@ -1142,6 +1174,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1146,6 +1178,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
  		bd_abort_claiming(bdev, loop_configure);
  out_putf:
  	fput(file);
@@ -39661,7 +39672,7 @@ index 333b3915fe86..1eb5bde57477 100644
  	/* This is safe: open() is still holding a reference. */
  	module_put(THIS_MODULE);
  	return error;
-@@ -1150,6 +1184,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1154,6 +1188,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
  static void __loop_clr_fd(struct loop_device *lo, bool release)
  {
  	struct file *filp;
@@ -39669,7 +39680,7 @@ index 333b3915fe86..1eb5bde57477 100644
  	gfp_t gfp = lo->old_gfp_mask;
  
  	if (test_bit(QUEUE_FLAG_WC, &lo->lo_queue->queue_flags))
-@@ -1166,6 +1201,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;
@@ -39677,7 +39688,7 @@ index 333b3915fe86..1eb5bde57477 100644
  	spin_unlock_irq(&lo->lo_lock);
  
  	lo->lo_device = NULL;
-@@ -1228,6 +1264,8 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1230,6 +1266,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);
@@ -39762,10 +39773,10 @@ index 07d3412e950f..c4a00f620e57 100644
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 96ca249ee1e6..b21abb1a2134 100644
+index b3a73aed62b8..97aa5e94fa31 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -2165,6 +2165,11 @@ struct super_operations {
+@@ -2188,6 +2188,11 @@ struct super_operations {
  	long (*free_cached_objects)(struct super_block *,
  				    struct shrink_control *);
  	void (*shutdown)(struct super_block *sb);
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index e12e0a6d..3a92acaf 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -6,7 +6,6 @@ ARCH_MEMORY_PROBE all=n
 ARM64_RELOC_TEST arm64=m
 ARM_KPROBES_TEST arm=m
 ARM_PTDUMP_DEBUGFS arm=n
-CALL_DEPTH_TRACKING all=y
 CALL_THUNKS_DEBUG all=n
 COMPAT_32BIT_TIME all=y
 CPA_DEBUG all=n
@@ -111,12 +110,13 @@ IO_DELAY_0XED all=n
 IO_DELAY_NONE all=n
 IO_DELAY_UDELAY all=n
 JUMP_LABEL all=y
-KPROBES arm=y arm64=y
+KPROBES all=y
 KVM_HYPERV all=y
 KVM_MAX_NR_VCPUS all=1024
 KVM_SMM all=y
 LOCK_EVENT_COUNTS all=n
 LTO_NONE all=y
+PAGE_SIZE_4KB x86=y x86_64=y arm=y arm64=y
 PID_IN_CONTEXTIDR arm=n arm64=n
 PUNIT_ATOM_DEBUG all=m
 RANDOMIZE_KSTACK_OFFSET_DEFAULT all=y
@@ -336,6 +336,7 @@ CRYPTO_STATS all=y
 #- file arch/loongarch/crypto/Kconfig goes here
 #- file arch/mips/crypto/Kconfig goes here
 #- file arch/powerpc/crypto/Kconfig goes here
+#- file arch/riscv/crypto/Kconfig goes here
 #- file arch/s390/crypto/Kconfig goes here
 #- file arch/sparc/crypto/Kconfig goes here
 #- file arch/x86/crypto/Kconfig goes here
@@ -433,9 +434,10 @@ ACPI_CUSTOM_DSDT all=n
 ACPI_TABLE_UPGRADE all=y
 ACPI_DEBUG all=n
 ACPI_PCI_SLOT all=y
+ACPI_CONTAINER all=y
 ACPI_HOTPLUG_MEMORY all=y
 ACPI_SBS x86=m
-ACPI_CUSTOM_METHOD all=m
+ACPI_HED all=y
 ACPI_BGRT all=y
 #- file drivers/acpi/nfit/Kconfig goes here
 #- file drivers/acpi/numa/Kconfig goes here
@@ -459,6 +461,7 @@ ACPI_APEI_GHES all=y
 ACPI_APEI_PCIEAER all=y
 ACPI_APEI_MEMORY_FAILURE all=y
 ACPI_APEI_EINJ all=m
+ACPI_APEI_EINJ_CXL all=y
 ACPI_APEI_ERST_DEBUG all=m
 
 #-
@@ -655,13 +658,6 @@ ATM_SOLOS all=m
 #-
 AUXDISPLAY all=y
 HD44780 all=m
-KS0108 all=m
-KS0108_PORT all=0x378
-KS0108_DELAY all=2
-CFAG12864B i386=m x86_64=m
-CFAG12864B_RATE i386=20 x86_64=20
-IMG_ASCII_LCD all=y
-HT16K33 all=m
 LCD2S all=m
 PANEL_PARPORT all=0
 PANEL_PROFILE all=5
@@ -669,6 +665,15 @@ PANEL_CHANGE_MESSAGE all=n
 CHARLCD_BL_OFF all=n
 CHARLCD_BL_ON all=n
 CHARLCD_BL_FLASH all=y
+KS0108 all=m
+KS0108_PORT all=0x378
+KS0108_DELAY all=2
+CFAG12864B i386=m x86_64=m
+CFAG12864B_RATE i386=20 x86_64=20
+IMG_ASCII_LCD all=y
+HT16K33 all=m
+MAX6959 all=m
+SEG_LED_GPIO all=m
 PANEL all=m
 
 #-
@@ -1362,7 +1367,6 @@ CRYPTO_DEV_CCP all=y
 #- file drivers/crypto/marvell/Kconfig goes here
 #- file drivers/crypto/intel/Kconfig goes here
 CRYPTO_DEV_CAVIUM_ZIP arm64=m
-#- file drivers/crypto/vmx/Kconfig goes here
 CRYPTO_DEV_ROCKCHIP arm64=m
 CRYPTO_DEV_ROCKCHIP_DEBUG arm64=n
 #- file drivers/crypto/chelsio/Kconfig goes here
@@ -1426,6 +1430,7 @@ CRYPTO_DEV_QAT_420XX all=m
 CRYPTO_DEV_QAT_DH895xCCVF all=m
 CRYPTO_DEV_QAT_C3XXXVF all=m
 CRYPTO_DEV_QAT_C62XVF all=m
+CRYPTO_DEV_QAT_ERROR_INJECTION all=n
 
 #-
 #- *** FILE: drivers/crypto/marvell/Kconfig ***
@@ -1448,7 +1453,6 @@ CXL_PMEM=m
 CXL_MEM all=m
 CXL_REGION all=y
 CXL_REGION_INVALIDATION_TEST all=n
-CXL_PMU all=m
 
 #-
 #- *** FILE: drivers/dax/Kconfig ***
@@ -1874,6 +1878,7 @@ GPIO_TPIC2810 all=m
 GPIO_TS4900 all=m
 GPIO_ARIZONA all=m
 GPIO_BD9571MWV all=m
+GPIO_CROS_EC all=m
 GPIO_CS5535 all=m
 GPIO_DA9052 all=m
 GPIO_DLN2 all=m
@@ -1928,6 +1933,7 @@ GPIO_SIM all=m
 #- *** FILE: drivers/gpu/drm/Kconfig ***
 #-
 DRM all=m
+DRM_DEBUG_MM all=n
 DRM_FBDEV_EMULATION all=y
 DRM_FBDEV_OVERALLOC all=100
 DRM_LOAD_EDID_FIRMWARE all=y
@@ -1941,7 +1947,7 @@ DRM_LOAD_EDID_FIRMWARE all=y
 #- file drivers/gpu/drm/xe/Kconfig goes here
 #- file drivers/gpu/drm/kmb/Kconfig goes here
 DRM_VGEM all=m
-DRM_VKMS all=m
+#- file drivers/gpu/drm/vkms/Kconfig goes here
 #- file drivers/gpu/drm/exynos/Kconfig goes here
 #- file drivers/gpu/drm/rockchip/Kconfig goes here
 #- file drivers/gpu/drm/vmwgfx/Kconfig goes here
@@ -2194,6 +2200,7 @@ DRM_I915_COMPRESS_ERROR all=y
 DRM_I915_USERPTR all=y
 DRM_I915_GVT_KVMGT all=m
 DRM_I915_PXP all=y
+DRM_I915_DP_TUNNEL all=y
 #- file drivers/gpu/drm/i915/Kconfig.debug goes here
 #- file drivers/gpu/drm/i915/Kconfig.profile goes here
 DRM_I915_GVT all=y
@@ -2288,34 +2295,32 @@ DRM_PANEL_AUO_A030JTN01 all=m
 DRM_PANEL_BOE_BF060Y8M_AJ0 arm=m arm64=m
 DRM_PANEL_BOE_HIMAX8279D arm=m arm64=m
 DRM_PANEL_BOE_TV101WUM_NL6 arm=m arm64=m
-DRM_PANEL_DSI_CM arm=m arm64=m
-DRM_PANEL_LVDS arm=m arm64=m
-DRM_PANEL_SIMPLE arm=m arm64=m
-DRM_PANEL_EDP arm=m arm64=m
 DRM_PANEL_EBBG_FT8719 arm=m arm64=m
 DRM_PANEL_ELIDA_KD35T133 arm=m arm64=m
 DRM_PANEL_FEIXIN_K101_IM2BA02 arm=m arm64=m
 DRM_PANEL_FEIYANG_FY07024DI26A30D arm=m arm64=m
+DRM_PANEL_DSI_CM arm=m arm64=m
+DRM_PANEL_LVDS arm=m arm64=m
 DRM_PANEL_HIMAX_HX8394 arm=m arm64=m
 DRM_PANEL_ILITEK_IL9322 arm=m arm64=m
-DRM_PANEL_ILITEK_ILI9341 arm=m arm64=m
+DRM_PANEL_ILITEK_ILI9341 all=m
 DRM_PANEL_ILITEK_ILI9805 arm=m arm64=m
 DRM_PANEL_ILITEK_ILI9881C arm=m arm64=m
 DRM_PANEL_ILITEK_ILI9882T arm=m arm64=m
 DRM_PANEL_INNOLUX_EJ030NA arm=m arm64=m
 DRM_PANEL_INNOLUX_P079ZCA arm=m arm64=m
 DRM_PANEL_JADARD_JD9365DA_H3 arm=m arm64=m
-DRM_PANEL_JDI_LT070ME05000 arm=m arm64=m
 DRM_PANEL_JDI_LPM102A188A arm=m arm64=m
+DRM_PANEL_JDI_LT070ME05000 arm=m arm64=m
 DRM_PANEL_JDI_R63452 arm=m arm64=m
 DRM_PANEL_KHADAS_TS050 arm=m arm64=m
 DRM_PANEL_KINGDISPLAY_KD097D04 arm=m arm64=m
 DRM_PANEL_LEADTEK_LTK050H3146W arm=m arm64=m
 DRM_PANEL_LEADTEK_LTK500HD1829 arm=m arm64=m
-DRM_PANEL_SAMSUNG_LD9040 arm=m arm64=m
 DRM_PANEL_LG_LB035Q02 arm=m arm64=m
 DRM_PANEL_LG_LG4573 arm=m arm64=m
 DRM_PANEL_MAGNACHIP_D53E6EA8966 arm=m arm64=m
+DRM_PANEL_MANTIX_MLAF057WE51 arm=m arm64=m
 DRM_PANEL_NEC_NL8048HL11 arm=m arm64=m
 DRM_PANEL_NEWVISION_NV3051D arm=m arm64=m
 DRM_PANEL_NEWVISION_NV3052C arm=m arm64=m
@@ -2325,7 +2330,6 @@ DRM_PANEL_NOVATEK_NT35950 arm=m arm64=m
 DRM_PANEL_NOVATEK_NT36523 arm=m arm64=m
 DRM_PANEL_NOVATEK_NT36672A arm=m arm64=m
 DRM_PANEL_NOVATEK_NT39016 arm=m arm64=m
-DRM_PANEL_MANTIX_MLAF057WE51 arm=m arm64=m
 DRM_PANEL_OLIMEX_LCD_OLINUXINO arm=m arm64=m
 DRM_PANEL_ORISETECH_OTA5601A all=m
 DRM_PANEL_ORISETECH_OTM8009A arm=m arm64=m
@@ -2336,8 +2340,10 @@ DRM_PANEL_RAYDIUM_RM67191 arm=m arm64=m
 DRM_PANEL_RAYDIUM_RM68200 arm=m arm64=m
 DRM_PANEL_RAYDIUM_RM692E5 arm=m arm64=m
 DRM_PANEL_RONBO_RB070D30 arm=m arm64=m
+DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 arm=m arm64=m
 DRM_PANEL_SAMSUNG_ATNA33XC20 arm=m arm64=m
 DRM_PANEL_SAMSUNG_DB7430 arm=m arm64=m
+DRM_PANEL_SAMSUNG_LD9040 arm=m arm64=m
 DRM_PANEL_SAMSUNG_S6D16D0 arm=m arm64=m
 DRM_PANEL_SAMSUNG_S6D27A1 arm=m arm64=m
 DRM_PANEL_SAMSUNG_S6D7AA0 arm=m arm64=m
@@ -2346,7 +2352,6 @@ DRM_PANEL_SAMSUNG_S6E63J0X03 arm=m arm64=m
 DRM_PANEL_SAMSUNG_S6E63M0 arm=m arm64=m
 DRM_PANEL_SAMSUNG_S6E63M0_SPI arm=m arm64=m
 DRM_PANEL_SAMSUNG_S6E63M0_DSI arm=m arm64=m
-DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 arm=m arm64=m
 DRM_PANEL_SAMSUNG_S6E8AA0 arm=m arm64=m
 DRM_PANEL_SAMSUNG_SOFEF00 arm=m arm64=m
 DRM_PANEL_SEIKO_43WVF1G arm=m arm64=m
@@ -2357,19 +2362,21 @@ DRM_PANEL_SHARP_LS060T1SX01 arm=m arm64=m
 DRM_PANEL_SITRONIX_ST7701 arm=m arm64=m
 DRM_PANEL_SITRONIX_ST7703 arm=m arm64=m
 DRM_PANEL_SITRONIX_ST7789V arm=m arm64=m
-DRM_PANEL_SYNAPTICS_R63353 arm=m arm64=m
 DRM_PANEL_SONY_ACX565AKM arm=m arm64=m
 DRM_PANEL_SONY_TD4353_JDI arm=m arm64=m
 DRM_PANEL_SONY_TULIP_TRULY_NT35521 arm=m arm64=m
 DRM_PANEL_STARTEK_KD070FHFID015 arm=m arm64=m
+DRM_PANEL_EDP arm=m arm64=m
+DRM_PANEL_SIMPLE arm=m arm64=m
+DRM_PANEL_SYNAPTICS_R63353 arm=m arm64=m
 DRM_PANEL_TDO_TL070WSH30 arm=m arm64=m
 DRM_PANEL_TPO_TD028TTEC1 arm=m arm64=m
 DRM_PANEL_TPO_TD043MTEA1 arm=m arm64=m
 DRM_PANEL_TPO_TPG110 arm=m arm64=m
 DRM_PANEL_TRULY_NT35597_WQXGA arm=m arm64=m
+DRM_PANEL_VISIONOX_R66451 arm=m arm64=m
 DRM_PANEL_VISIONOX_RM69299 arm=m arm64=m
 DRM_PANEL_VISIONOX_VTDR6130 arm=m arm64=m
-DRM_PANEL_VISIONOX_R66451 arm=m arm64=m
 DRM_PANEL_WIDECHIPS_WS2401 all=m
 DRM_PANEL_XINPENG_XPP055C272 arm=m arm64=m
 
@@ -2497,6 +2504,11 @@ DRM_VC4_HDMI_CEC arm=y arm64=y
 DRM_VIRTIO_GPU all=m
 DRM_VIRTIO_GPU_KMS all=y
 
+#-
+#- *** FILE: drivers/gpu/drm/vkms/Kconfig ***
+#-
+DRM_VKMS all=m
+
 #-
 #- *** FILE: drivers/gpu/drm/vmwgfx/Kconfig ***
 #-
@@ -2779,6 +2791,7 @@ SENSORS_AHT10 all=m
 SENSORS_AQUACOMPUTER_D5NEXT all=m
 SENSORS_AS370 all=m
 SENSORS_ASC7621 all=m
+SENSORS_ASUS_ROG_RYUJIN all=m
 SENSORS_AXI_FAN_CONTROL all=m
 SENSORS_K8TEMP all=m
 SENSORS_K10TEMP all=m
@@ -2788,6 +2801,7 @@ SENSORS_ARM_SCPI all=m
 SENSORS_ASB100 all=m
 SENSORS_ASPEED all=m
 SENSORS_ATXP1 all=m
+SENSORS_CHIPCAP2 all=m
 SENSORS_CORSAIR_CPRO all=m
 SENSORS_CORSAIR_PSU all=m
 SENSORS_DRIVETEMP all=m
@@ -2834,6 +2848,7 @@ SENSORS_LTC4222 all=m
 SENSORS_LTC4245 all=m
 SENSORS_LTC4260 all=m
 SENSORS_LTC4261 all=m
+SENSORS_LTC4282 all=m
 SENSORS_MAX1111 all=m
 SENSORS_MAX127 all=m
 SENSORS_MAX16065 all=m
@@ -2885,12 +2900,14 @@ SENSORS_NCT7802 all=m
 SENSORS_NCT7904 all=m
 SENSORS_NPCM7XX all=m
 SENSORS_NZXT_KRAKEN2 all=m
+SENSORS_NZXT_KRAKEN3 all=m
 SENSORS_NZXT_SMART2 all=m
 #- file drivers/hwmon/occ/Kconfig goes here
 SENSORS_OXP all=m
 SENSORS_PCF8591 all=m
 #- file drivers/hwmon/peci/Kconfig goes here
 #- file drivers/hwmon/pmbus/Kconfig goes here
+SENSORS_PT5161L all=m
 SENSORS_PWM_FAN arm=m arm64=m
 SENSORS_RASPBERRYPI_HWMON arm=m arm64=m
 SENSORS_SL28CPLD all=m
@@ -2914,6 +2931,7 @@ SENSORS_SMSC47B397 all=m
 SENSORS_SCH5627 all=m
 SENSORS_SCH5636 all=m
 SENSORS_STTS751 all=m
+SENSORS_SURFACE_FAN all=m
 SENSORS_ADC128D818 all=m
 SENSORS_ADS7828 all=m
 SENSORS_ADS7871 all=m
@@ -3015,6 +3033,7 @@ SENSORS_MP5023 all=m
 SENSORS_MP5990 all=m
 SENSORS_MPQ7932_REGULATOR all=y
 SENSORS_MPQ7932 all=m
+SENSORS_MPQ8785 all=m
 SENSORS_PIM4328=m
 SENSORS_PLI1209BC all=m
 SENSORS_PLI1209BC_REGULATOR all=y
@@ -3329,7 +3348,7 @@ AD7923 all=m
 AD7949 all=m
 AD799X all=m
 AD9467 all=m
-ADI_AXI_ADC arm=m arm64=m
+ADI_AXI_ADC all=m
 AXP20X_ADC all=m
 AXP288_ADC all=m
 CC10001_ADC all=m
@@ -3365,6 +3384,7 @@ MEN_Z188_ADC all=m
 MESON_SARADC arm64=m
 MP2629_ADC all=m
 NAU7802 all=m
+PAC1934 all=m
 QCOM_PM8XXX_XOADC arm=m
 QCOM_SPMI_IADC all=m
 QCOM_SPMI_VADC all=m
@@ -3384,6 +3404,7 @@ TI_ADC161S626 all=m
 TI_ADS1015 all=m
 TI_ADS7924 all=m
 TI_ADS1100 all=m
+TI_ADS1298 all=m
 TI_ADS7950 all=m
 TI_ADS8344 all=m
 TI_ADS8688 all=m
@@ -3532,6 +3553,7 @@ AD9523 all=m
 ADF4350 all=m
 ADF4371 all=m
 ADF4377 all=m
+ADMFM2000 all=m
 ADMV1013 all=m
 ADMV1014 all=m
 ADMV4420 all=m
@@ -4337,6 +4359,8 @@ TOUCHSCREEN_EGALAX_SERIAL all=m
 TOUCHSCREEN_EXC3000 all=m
 TOUCHSCREEN_FUJITSU all=m
 TOUCHSCREEN_GOODIX all=m
+TOUCHSCREEN_GOODIX_BERLIN_I2C all=m
+TOUCHSCREEN_GOODIX_BERLIN_SPI all=m
 TOUCHSCREEN_HIDEEP all=m
 TOUCHSCREEN_HYCON_HY46XX all=m
 TOUCHSCREEN_HYNITRON_CSTXXX all=m
@@ -4769,6 +4793,8 @@ DM_SWITCH all=m
 DM_LOG_WRITES all=m
 DM_INTEGRITY all=m
 DM_ZONED all=m
+DM_AUDIT all=y
+#- file drivers/md/dm-vdo/Kconfig goes here
 
 #-
 #- *** FILE: drivers/md/bcache/Kconfig ***
@@ -4777,6 +4803,11 @@ BCACHE all=m
 BCACHE_DEBUG all=n
 BCACHE_ASYNC_REGISTRATION all=y
 
+#-
+#- *** FILE: drivers/md/dm-vdo/Kconfig ***
+#-
+DM_VDO all=m
+
 #-
 #- *** FILE: drivers/media/Kconfig ***
 #-
@@ -6448,7 +6479,6 @@ MTD_IMPA7 arm=m
 MTD_PCI all=m
 MTD_PCMCIA all=m
 MTD_PCMCIA_ANONYMOUS all=y
-MTD_INTEL_VR_NOR all=m
 MTD_PLATRAM all=m
 
 #-
@@ -6549,6 +6579,7 @@ MTD_UBI_BEB_LIMIT all=20
 MTD_UBI_FASTMAP all=n
 MTD_UBI_GLUEBI all=n powerpc=m
 MTD_UBI_BLOCK all=y
+MTD_UBI_NVMEM all=m
 
 #-
 #- *** FILE: drivers/mux/Kconfig ***
@@ -6674,6 +6705,7 @@ CAN_XILINXCAN arm64=m
 #- file drivers/net/can/c_can/Kconfig goes here
 #- file drivers/net/can/cc770/Kconfig goes here
 #- file drivers/net/can/ctucanfd/Kconfig goes here
+#- file drivers/net/can/esd/Kconfig goes here
 #- file drivers/net/can/ifi_canfd/Kconfig goes here
 #- file drivers/net/can/m_can/Kconfig goes here
 #- file drivers/net/can/mscan/Kconfig goes here
@@ -6705,6 +6737,11 @@ CAN_CC770_PLATFORM all=m
 CAN_CTUCANFD_PCI all=m
 CAN_CTUCANFD_PLATFORM arm=m arm64=m
 
+#-
+#- *** FILE: drivers/net/can/esd/Kconfig ***
+#-
+CAN_ESD_402_PCI all=m
+
 #-
 #- *** FILE: drivers/net/can/ifi_canfd/Kconfig ***
 #-
@@ -7395,6 +7432,7 @@ SKY2 all=m sparc=n
 SKY2_DEBUG all=n
 #- file drivers/net/ethernet/marvell/octeontx2/Kconfig goes here
 #- file drivers/net/ethernet/marvell/octeon_ep/Kconfig goes here
+#- file drivers/net/ethernet/marvell/octeon_ep_vf/Kconfig goes here
 #- file drivers/net/ethernet/marvell/prestera/Kconfig goes here
 
 #-
@@ -7402,6 +7440,11 @@ SKY2_DEBUG all=n
 #-
 OCTEON_EP all=m
 
+#-
+#- *** FILE: drivers/net/ethernet/marvell/octeon_ep_vf/Kconfig ***
+#-
+OCTEON_EP_VF all=m
+
 #-
 #- *** FILE: drivers/net/ethernet/marvell/octeontx2/Kconfig ***
 #-
@@ -7952,7 +7995,7 @@ NXP_CBTX_PHY all=m
 NXP_C45_TJA11XX_PHY all=m
 NXP_TJA11XX_PHY all=m
 NCN26000_PHY all=m
-AT803X_PHY all=m
+#- file drivers/net/phy/qcom/Kconfig goes here
 QSEMI_PHY all=m
 REALTEK_PHY all=m
 RENESAS_PHY all=m
@@ -7976,6 +8019,13 @@ MICREL_KS8995MA all=m
 #-
 AQUANTIA_PHY all=m
 
+#-
+#- *** FILE: drivers/net/phy/qcom/Kconfig ***
+#-
+AT803X_PHY all=m
+QCA83XX_PHY all=m
+QCA808X_PHY all=m
+
 #-
 #- *** FILE: drivers/net/plip/Kconfig ***
 #-
@@ -9074,6 +9124,7 @@ ALIBABA_UNCORE_DRW_PMU arm64=m
 DWC_PCIE_PMU all=m
 #- file drivers/perf/arm_cspmu/Kconfig goes here
 #- file drivers/perf/amlogic/Kconfig goes here
+CXL_PMU all=m
 
 #-
 #- *** FILE: drivers/perf/amlogic/Kconfig ***
@@ -9116,6 +9167,7 @@ PHY_CAN_TRANSCEIVER=m
 #- file drivers/phy/mscc/Kconfig goes here
 #- file drivers/phy/qualcomm/Kconfig goes here
 #- file drivers/phy/ralink/Kconfig goes here
+#- file drivers/phy/realtek/Kconfig goes here
 #- file drivers/phy/renesas/Kconfig goes here
 #- file drivers/phy/rockchip/Kconfig goes here
 #- file drivers/phy/samsung/Kconfig goes here
@@ -9592,7 +9644,7 @@ INTEL_SKL_INT3472=m
 #-
 #- *** FILE: drivers/platform/x86/intel/pmc/Kconfig ***
 #-
-INTEL_PMC_CORE all=y
+INTEL_PMC_CORE all=m
 
 #-
 #- *** FILE: drivers/platform/x86/intel/pmt/Kconfig ***
@@ -9842,6 +9894,7 @@ PTP_1588_CLOCK_PCH all=m
 PTP_1588_CLOCK_KVM all=m
 PTP_1588_CLOCK_IDT82P33 all=m
 PTP_1588_CLOCK_IDTCM all=m
+PTP_1588_CLOCK_FC3W all=m
 PTP_1588_CLOCK_MOCK all=m
 PTP_1588_CLOCK_VMW all=m
 PTP_1588_CLOCK_OCP all=m
@@ -9899,6 +9952,19 @@ RAPIDIO_CPS_XX all=m
 RAPIDIO_CPS_GEN2 all=m
 RAPIDIO_RXS_GEN3 all=m
 
+#-
+#- *** FILE: drivers/ras/Kconfig ***
+#-
+RAS all=y
+#- file arch/x86/ras/Kconfig goes here
+#- file drivers/ras/amd/atl/Kconfig goes here
+RAS_FMPM all=m
+
+#-
+#- *** FILE: drivers/ras/amd/atl/Kconfig ***
+#-
+AMD_ATL all=m
+
 #-
 #- *** FILE: drivers/regulator/Kconfig ***
 #-
@@ -10057,6 +10123,7 @@ REMOTEPROC_CDEV all=y
 #-
 RESET_CONTROLLER all=y
 RESET_BRCMSTB_RESCAL all=y
+RESET_GPIO all=m
 RESET_INTEL_GW arm=n arm64=n
 RESET_MESON arm64=m
 RESET_MESON_AUDIO_ARB arm64=m
@@ -10568,6 +10635,7 @@ WPCM450_SOC all=m
 #-
 QCOM_PMIC_PDCHARGER_ULOG all=m
 QCOM_PMIC_GLINK arm=m arm64=m
+QCOM_PBS all=m
 
 #-
 #- *** FILE: drivers/soc/rockchip/Kconfig ***
@@ -10690,10 +10758,8 @@ STAGING all=y
 #- file drivers/staging/vt6656/Kconfig goes here
 #- file drivers/staging/iio/Kconfig goes here
 #- file drivers/staging/sm750fb/Kconfig goes here
-#- file drivers/staging/emxx_udc/Kconfig goes here
 #- file drivers/staging/nvec/Kconfig goes here
 #- file drivers/staging/media/Kconfig goes here
-#- file drivers/staging/board/Kconfig goes here
 #- file drivers/staging/gdm724x/Kconfig goes here
 #- file drivers/staging/fbtft/Kconfig goes here
 #- file drivers/staging/most/Kconfig goes here
@@ -10710,11 +10776,6 @@ STAGING all=y
 #-
 XIL_AXIS_FIFO all=m
 
-#-
-#- *** FILE: drivers/staging/board/Kconfig ***
-#-
-STAGING_BOARD arm=n arm64=n
-
 #-
 #- *** FILE: drivers/staging/fbtft/Kconfig ***
 #-
@@ -11079,7 +11140,6 @@ THERMAL_STATISTICS all=y
 THERMAL_DEBUGFS all=n
 THERMAL_EMERGENCY_POWEROFF_DELAY_MS all=0
 THERMAL_OF arm=y arm64=y
-THERMAL_WRITABLE_TRIPS all=y
 THERMAL_DEFAULT_GOV_STEP_WISE all=y
 THERMAL_DEFAULT_GOV_FAIR_SHARE all=n
 THERMAL_DEFAULT_GOV_USER_SPACE all=n
@@ -11150,7 +11210,6 @@ USB4_DMA_TEST all=m
 VT all=y
 CONSOLE_TRANSLATIONS all=y
 VT_CONSOLE all=y
-HW_CONSOLE all=y
 VT_HW_CONSOLE_BINDING all=y
 UNIX98_PTYS all=y
 LEGACY_PTYS all=y
@@ -11428,6 +11487,7 @@ USB_OTG_DISABLE_EXTERNAL_HUB all=n
 USB_OTG_FSM all=m
 USB_LEDS_TRIGGER_USBPORT all=m
 USB_AUTOSUSPEND_DELAY all=2
+USB_DEFAULT_AUTHORIZATION_MODE all=1
 
 #-
 #- *** FILE: drivers/usb/dwc2/Kconfig ***
@@ -11580,7 +11640,7 @@ USB_C67X00_HCD all=m
 USB_XHCI_HCD all=m
 USB_XHCI_DBGCAP all=n
 USB_XHCI_PCI_RENESAS all=m
-USB_XHCI_PLATFORM arm=m arm64=m
+USB_XHCI_PLATFORM all=m
 USB_XHCI_MVEBU arm=m
 USB_EHCI_HCD all=m
 USB_EHCI_ROOT_HUB_TT all=y sparc64=n
@@ -11589,7 +11649,7 @@ USB_EHCI_FSL all=m
 USB_EHCI_HCD_ORION arm=m
 USB_EHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_EHCI_MV all=y
-USB_EHCI_HCD_PLATFORM arm=m arm64=m
+USB_EHCI_HCD_PLATFORM all=m
 USB_OXU210HP_HCD all=m
 USB_ISP116X_HCD all=m
 USB_ISP1362_HCD all=m
@@ -11608,7 +11668,7 @@ USB_SL811_CS all=m
 USB_R8A66597_HCD all=m
 USB_RENESAS_USBHS_HCD all=m
 USB_HCD_BCMA all=m
-USB_HCD_SSB arm=m arm64=m
+USB_HCD_SSB all=m
 USB_HCD_TEST_MODE all=n
 USB_XEN_HCD all=m
 
@@ -11813,6 +11873,7 @@ TYPEC_MUX_FSA4480 all=m
 TYPEC_MUX_GPIO_SBU all=m
 TYPEC_MUX_PI3USB30532 all=m
 TYPEC_MUX_INTEL_PMC all=m
+TYPEC_MUX_IT5205 all=m
 TYPEC_MUX_NB7VPQ904M all=m
 TYPEC_MUX_PTN36502 all=m
 TYPEC_MUX_WCD939X_USBSS all=m
@@ -11908,6 +11969,7 @@ VFIO_PCI_IGD all=y
 #- file drivers/vfio/pci/hisilicon/Kconfig goes here
 #- file drivers/vfio/pci/pds/Kconfig goes here
 #- file drivers/vfio/pci/virtio/Kconfig goes here
+#- file drivers/vfio/pci/nvgrace-gpu/Kconfig goes here
 
 #-
 #- *** FILE: drivers/vfio/pci/hisilicon/Kconfig ***
@@ -11975,7 +12037,7 @@ LCD_L4F00242T03 all=m
 LCD_LMS283GF05 all=m
 LCD_LTV350QV all=m
 LCD_ILI922X all=m
-LCD_ILI9320 arm=m arm64=m
+LCD_ILI9320 all=m
 LCD_TDO24M all=m
 LCD_VGG2432A4 all=m
 LCD_PLATFORM all=m
@@ -11985,6 +12047,7 @@ LCD_HX8357 all=m
 LCD_OTM3225A all=m
 BACKLIGHT_CLASS_DEVICE all=y
 BACKLIGHT_KTD253 all=m
+BACKLIGHT_KTD2801 all=m
 BACKLIGHT_KTZ8866 all=m
 BACKLIGHT_LM3533 all=m
 BACKLIGHT_PWM all=m
@@ -12248,6 +12311,7 @@ W1_MASTER_DS2482 all=m
 W1_MASTER_GPIO all=m
 HDQ_MASTER_OMAP all=m
 W1_MASTER_SGI all=m
+W1_MASTER_UART all=m
 
 #-
 #- *** FILE: drivers/w1/slaves/Kconfig ***
@@ -12291,6 +12355,7 @@ WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC all=y
 #- Watchdog Device Drivers
 SOFT_WATCHDOG all=m
 SOFT_WATCHDOG_PRETIMEOUT all=y
+CROS_EC_WATCHDOG all=m
 DA9052_WATCHDOG all=m
 DA9063_WATCHDOG all=m
 DA9062_WATCHDOG all=m
@@ -12443,6 +12508,7 @@ FS_MBCACHE all=m
 #- file fs/zonefs/Kconfig goes here
 FS_DAX all=y
 FS_POSIX_ACL all=y
+EXPORTFS_BLOCK_OPS all=y
 FILE_LOCKING all=y
 #- file fs/crypto/Kconfig goes here
 #- file fs/verity/Kconfig goes here
@@ -12457,7 +12523,6 @@ FILE_LOCKING all=y
 #- file fs/udf/Kconfig goes here
 #- file fs/fat/Kconfig goes here
 #- file fs/exfat/Kconfig goes here
-#- file fs/ntfs/Kconfig goes here
 #- file fs/ntfs3/Kconfig goes here
 #- file fs/proc/Kconfig goes here
 #- file fs/kernfs/Kconfig goes here
@@ -12732,6 +12797,7 @@ FUSE_FS all=m
 CUSE all=m
 VIRTIO_FS all=m
 FUSE_DAX all=y
+FUSE_PASSTHROUGH all=y
 
 #-
 #- *** FILE: fs/gfs2/Kconfig ***
@@ -12915,13 +12981,6 @@ FANOTIFY_ACCESS_PERMISSIONS all=y
 #-
 INOTIFY_USER all=y
 
-#-
-#- *** FILE: fs/ntfs/Kconfig ***
-#-
-NTFS_FS all=m
-NTFS_DEBUG all=n
-NTFS_RW all=y
-
 #-
 #- *** FILE: fs/ntfs3/Kconfig ***
 #-
@@ -12929,6 +12988,7 @@ NTFS3_FS all=m
 NTFS3_64BIT_CLUSTER all=n
 NTFS3_LZX_XPRESS all=y
 NTFS3_FS_POSIX_ACL all=y
+NTFS_FS all=m
 
 #-
 #- *** FILE: fs/ocfs2/Kconfig ***
@@ -13379,6 +13439,7 @@ MODULE_COMPRESS_ZSTD all=n
 MODULE_DECOMPRESS all=y
 MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS all=n
 MODPROBE_PATH="/sbin/modprobe"
+TRIM_UNUSED_KSYMS all=n
 #- file tree. goes here
 
 #-
@@ -13389,6 +13450,8 @@ SUSPEND_FREEZER ppc=y ppc64=y
 HIBERNATE_CALLBACKS all=y
 HIBERNATION all=y
 HIBERNATION_SNAPSHOT_DEV all=y
+HIBERNATION_COMP_LZO all=y
+HIBERNATION_COMP_LZ4 all=n
 PM_STD_PARTITION all=""
 PM_SLEEP all=y
 PM_SLEEP_SMP all=y
@@ -13696,8 +13759,8 @@ PERCPU_TEST all=m
 ATOMIC64_SELFTEST all=n
 ASYNC_RAID6_TEST all=m
 TEST_HEXDUMP all=m
-STRING_SELFTEST all=n
-TEST_STRING_HELPERS all=m
+STRING_KUNIT_TEST all=n
+STRING_HELPERS_KUNIT_TEST all=m
 TEST_KSTRTOX all=m
 TEST_PRINTF all=m
 TEST_SCANF=m
@@ -13829,7 +13892,6 @@ XZ_DEC_TEST all=m
 SWAP all=y
 ZSWAP all=y
 ZSWAP_DEFAULT_ON all=y
-ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON all=n
 ZSWAP_SHRINKER_DEFAULT_ON all=y
 ZSWAP_COMPRESSOR_DEFAULT_DEFLATE all=n
 ZSWAP_COMPRESSOR_DEFAULT_LZO all=y
@@ -13877,7 +13939,6 @@ TRANSPARENT_HUGEPAGE_MADVISE all=n
 TRANSPARENT_HUGEPAGE_NEVER all=n
 READ_ONLY_THP_FOR_FS all=n
 CMA all=y
-CMA_DEBUG all=n
 CMA_DEBUGFS all=n
 CMA_SYSFS all=y
 CMA_AREAS all=7
@@ -13923,6 +13984,7 @@ DAMON all=y
 DAMON_VADDR all=y arm=n
 DAMON_PADDR all=y arm=n
 DAMON_SYSFS all=y
+DAMON_DBGFS_DEPRECATED all=n
 DAMON_DBGFS all=y
 DAMON_RECLAIM all=y
 DAMON_LRU_SORT all=y
@@ -14025,6 +14087,8 @@ PCPU_DEV_REFCNT all=y
 MAX_SKB_FRAGS all=17
 RFS_ACCEL all=y
 CGROUP_NET_PRIO all=y
+CGROUP_NET_CLASSID all=y
+BQL all=y
 BPF_STREAM_PARSER all=y
 NET_PKTGEN all=m
 NET_DROP_MONITOR all=y
@@ -14805,9 +14869,6 @@ RDS all=m
 RDS_RDMA all=m
 RDS_TCP all=m
 RDS_DEBUG all=n
-SPECTRE_BHI_ON x86=y x86_64=y
-SPECTRE_BHI_OFF x86=n x86_64=n
-SPECTRE_BHI_AUTO x86=n x86_64=n
 
 #-
 #- *** FILE: net/rfkill/Kconfig ***
@@ -14897,7 +14958,6 @@ NET_ACT_GACT all=m
 GACT_PROB all=y
 NET_ACT_MIRRED all=m
 NET_ACT_SAMPLE all=m
-NET_ACT_IPT all=m
 NET_ACT_NAT all=m
 NET_ACT_PEDIT all=m
 NET_ACT_SIMP all=m
@@ -15603,9 +15663,10 @@ SND_SOC_AMD_ACP5x all=m
 SND_SOC_AMD_VANGOGH_MACH all=m
 SND_SOC_AMD_ACP6x all=m
 SND_SOC_AMD_YC_MACH all=m
-SND_AMD_ACP_CONFIG arm=m arm64=m
+SND_AMD_ACP_CONFIG all=m
 #- file sound/soc/amd/acp/Kconfig goes here
 SND_SOC_AMD_RPL_ACP6x all=m
+SND_SOC_AMD_SOUNDWIRE all=m
 SND_SOC_AMD_PS all=m
 SND_SOC_AMD_PS_MACH all=m
 
@@ -15707,18 +15768,18 @@ SND_SOC_DMIC all=m
 SND_SOC_ES7134 all=m
 SND_SOC_ES7241 all=m
 SND_SOC_ES8316 all=m
-SND_SOC_ES8326 arm=m arm64=m
+SND_SOC_ES8326 all=m
 SND_SOC_ES8328 all=m
 SND_SOC_ES8328_I2C all=m
 SND_SOC_ES8328_SPI all=m
 SND_SOC_GTM601 all=m
 SND_SOC_HDAC_HDMI all=m
-SND_SOC_HDA arm=m arm64=m
+SND_SOC_HDA all=m
 SND_SOC_ICS43432 all=m
 SND_SOC_IDT821034 all=m
 SND_SOC_INNO_RK3036 all=m
 SND_SOC_MAX98088 all=m
-SND_SOC_MAX98090 arm=m arm64=m
+SND_SOC_MAX98090 all=m
 SND_SOC_MAX98095 all=m
 SND_SOC_MAX98357A all=m
 SND_SOC_MAX98504 all=m
@@ -15756,7 +15817,7 @@ SND_SOC_RK817 arm=m arm64=m
 SND_SOC_RT1017_SDCA_SDW all=m
 SND_SOC_RT1308_SDW all=m
 SND_SOC_RT1316_SDW all=m
-SND_SOC_RT1318_SDW arm=m arm64=m
+SND_SOC_RT1318_SDW all=m
 SND_SOC_RT5616 all=m
 SND_SOC_RT5631 all=m
 SND_SOC_RT5640 all=m
@@ -15822,6 +15883,7 @@ SND_SOC_UDA1334 all=m
 SND_SOC_WCD9335 all=m
 SND_SOC_WCD934X all=m
 SND_SOC_WCD938X_SDW=m
+SND_SOC_WCD939X_SDW all=m
 SND_SOC_WM1250_EV1 all=m
 SND_SOC_WM8510 all=m
 SND_SOC_WM8523 all=m
@@ -15943,6 +16005,12 @@ SND_SST_ATOM_HIFI2_PLATFORM all=m
 SND_SST_ATOM_HIFI2_PLATFORM_PCI all=m
 SND_SST_ATOM_HIFI2_PLATFORM_ACPI all=m
 SND_SOC_INTEL_SKYLAKE all=m
+SND_SOC_INTEL_SKL all=m
+SND_SOC_INTEL_APL all=m
+SND_SOC_INTEL_KBL all=m
+SND_SOC_INTEL_GLK all=m
+SND_SOC_INTEL_CNL all=m
+SND_SOC_INTEL_CFL all=m
 SND_SOC_INTEL_CML_H all=m
 SND_SOC_INTEL_CML_LP all=m
 SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC all=y
@@ -16088,6 +16156,7 @@ SND_SOC_SOF_AMD_TOPLEVEL all=m
 SND_SOC_SOF_AMD_RENOIR all=m
 SND_SOC_SOF_AMD_VANGOGH all=m
 SND_SOC_SOF_AMD_REMBRANDT all=m
+SND_SOC_SOF_AMD_SOUNDWIRE all=m
 SND_SOC_SOF_AMD_ACP63 all=m
 
 #-
diff --git a/kernel-pom-ng-IPV4OPTSSTRIP.patch b/kernel-pom-ng-IPV4OPTSSTRIP.patch
index 0e0adca8..30127708 100644
--- a/kernel-pom-ng-IPV4OPTSSTRIP.patch
+++ b/kernel-pom-ng-IPV4OPTSSTRIP.patch
@@ -2,8 +2,8 @@ diff -ur linux-5.9/net/ipv4/netfilter.org/Kconfig linux-5.9/net/ipv4/netfilter/K
 --- linux-5.9/net/ipv4/netfilter.org/Kconfig	2020-10-11 23:15:50.000000000 +0200
 +++ linux-5.9/net/ipv4/netfilter/Kconfig	2020-11-03 13:07:22.874511004 +0100
 @@ -356,5 +356,15 @@
- 
- endif # IP_NF_ARPTABLES
+ 	  This option is needed by both arptables-legacy and arptables-nft.
+ 	  It is not used by nftables.
  
 +config IP_NF_TARGET_IPV4OPTSSTRIP
 +	tristate  'IPV4OPTSSTRIP target support'
diff --git a/kernel-x86.config b/kernel-x86.config
index 5637eb98..abf6c00d 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -7,6 +7,7 @@ SMP x86=y
 X86_X2APIC all=y
 X86_MPPARSE x86=y
 X86_CPU_RESCTRL all=y
+X86_FRED x86_64=y
 X86_BIGSMP i386=y
 X86_EXTENDED_PLATFORM i386=y x86_64=y
 X86_NUMACHIP all=n
@@ -112,15 +113,16 @@ CMDLINE_BOOL x86=n
 STRICT_SIGALTSTACK_SIZE all=y
 #- file kernel/livepatch/Kconfig goes here
 CPU_MITIGATIONS x86=y x86_64=y
-PAGE_TABLE_ISOLATION all=y
-RETPOLINE x86=y
-RETHUNK x86=n x86_64=y
-CPU_UNRET_ENTRY x86_64=y
-CPU_IBPB_ENTRY x86_64=y
-CPU_IBRS_ENTRY x86_64=y
-CPU_SRSO x86_64=y
-SLS x86_64=y
-GDS_FORCE_MITIGATION x86_64=n x86=n
+MITIGATION_PAGE_TABLE_ISOLATION all=y
+MITIGATION_RETPOLINE x86=y
+MITIGATION_RETHUNK x86=n x86_64=y
+MITIGATION_UNRET_ENTRY x86_64=y
+MITIGATION_CALL_DEPTH_TRACKING x86=y
+MITIGATION_IBPB_ENTRY x86_64=y
+MITIGATION_IBRS_ENTRY x86_64=y
+MITIGATION_SRSO x86_64=y
+MITIGATION_SLS x86_64=y
+MITIGATION_GDS_FORCE x86_64=n x86=n
 MITIGATION_RFDS x86_64=y
 MITIGATION_SPECTRE_BHI x86=y x86_64=y
 #- file kernel/power/Kconfig goes here
================================================================

---- gitweb:

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




More information about the pld-cvs-commit mailing list