[packages/kernel] - up to 5.8.0; builds without aufs

arekm arekm at pld-linux.org
Mon Aug 3 11:14:11 CEST 2020


commit 42b5c33a9137a17d1bf97dd43ad1ad45de94d3e9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Aug 3 11:14:00 2020 +0200

    - up to 5.8.0; builds without aufs

 kernel-aufs5.patch      | 318 +++++++++++++++++++++---------------------
 kernel-multiarch.config | 364 +++++++++++++++++++++++++++++++++++++-----------
 kernel.spec             |  14 +-
 3 files changed, 445 insertions(+), 251 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 430aec57..82cbfa08 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
-%define		basever		5.7
-%define		postver		.11
+%define		rel		0.1
+%define		basever		5.8
+%define		postver		.0
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -124,7 +124,7 @@ Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5:	f63ed18935914e1ee3e04c2a0ce1ba3b
+# Source0-md5:	0e5c4c15266218ef26c50fac0016095b
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
 # Patch0-md5:	a2824a09c83af1bacb337288a41c80d9
@@ -201,7 +201,7 @@ Patch101:	kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs5-standalone.git
 # cd aufs5-standalone
-# git checkout -b aufs5.4 origin/aufs5.4
+# git checkout -b aufs5.8 origin/aufs5.8
 # cat aufs5-kbuild.patch aufs5-base.patch aufs5-mmap.patch aufs5-standalone.patch > ~/rpm/packages/kernel/kernel-aufs5.patch
 # rm -rf linux && mkdir linux; cp -a Documentation fs include linux
 # diff -urN /usr/share/empty linux | filterdiff -x linux/include/uapi/linux/Kbuild >> ~/rpm/packages/kernel/kernel-aufs5.patch
@@ -730,7 +730,8 @@ find -name '*.py' -print0 | \
 	scripts/jobserver-exec \
 	scripts/show_delta \
 	tools/hv/vmbus_testing \
-	tools/kvm/kvm_stat/kvm_stat
+	tools/kvm/kvm_stat/kvm_stat \
+	tools/testing/selftests/exec/binfmt_script
 
 find -name '*.pl' -print0 | \
 	xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
@@ -1100,7 +1101,6 @@ mv $RPM_BUILD_ROOT{%{_kernelsrcdir}/Documentation,%{_docdir}/%{name}-%{version}}
 
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/dontdiff
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/Makefile
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*/Makefile
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*/*/Makefile
 %else
 %{__rm} -r $RPM_BUILD_ROOT%{_kernelsrcdir}/Documentation
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index a1934da9..d219cef1 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
-index 708ba336e689..84eedbf8654e 100644
+index f08fbbfafd9a0..1c597cddc351c 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -266,6 +266,7 @@ source "fs/sysv/Kconfig"
+@@ -267,6 +267,7 @@ source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
  source "fs/erofs/Kconfig"
  source "fs/vboxsf/Kconfig"
@@ -14,10 +14,10 @@ index 708ba336e689..84eedbf8654e 100644
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
-index 505e51166973..d53a5678fd7d 100644
+index 2ce5112b02c86..d9b4a51985538 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -135,3 +135,4 @@ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
+@@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
  obj-$(CONFIG_EROFS_FS)		+= erofs/
  obj-$(CONFIG_VBOXSF_FS)		+= vboxsf/
  obj-$(CONFIG_ZONEFS_FS)		+= zonefs/
@@ -26,10 +26,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index fcd79fc38928..9751b7b48696 100644
+index 50659d76976b7..80f67140e4f70 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2919,6 +2919,19 @@ F:	include/linux/audit.h
+@@ -2946,6 +2946,19 @@ F:	include/linux/audit.h
  F:	include/uapi/linux/audit.h
  F:	kernel/audit*
  
@@ -50,10 +50,10 @@ index fcd79fc38928..9751b7b48696 100644
  M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis at gmail.com>
  S:	Maintained
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 739b372a5112..872e3b3a7693 100644
+index da693e6a834e5..0479902a0cd50 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -750,6 +750,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -753,6 +753,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	return error;
  }
  
@@ -79,7 +79,7 @@ index 739b372a5112..872e3b3a7693 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index b280e07e162b..046000653e4d 100644
+index b280e07e162b1..046000653e4d8 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1266,7 +1266,7 @@ enum d_walk_ret {
@@ -92,7 +92,7 @@ index b280e07e162b..046000653e4d 100644
  {
  	struct dentry *this_parent;
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 9bc167562ee8..b0935c67bd1e 100644
+index 2e4c0fa2074b0..0b28a37f7e505 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -32,7 +32,7 @@
@@ -114,10 +114,10 @@ index 9bc167562ee8..b0935c67bd1e 100644
  		return error;
  
 diff --git a/fs/inode.c b/fs/inode.c
-index 7d57068b6b7a..c5a5578773d4 100644
+index 93d9252a00ab4..7700c5e4783b9 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1687,7 +1687,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1688,7 +1688,7 @@ EXPORT_SYMBOL(generic_update_time);
   * This does the actual work of updating an inodes time or version.  Must have
   * had called mnt_want_write() before calling this.
   */
@@ -127,7 +127,7 @@ index 7d57068b6b7a..c5a5578773d4 100644
  	if (inode->i_op->update_time)
  		return inode->i_op->update_time(inode, time, flags);
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 85b5f7bea82e..c742051ba969 100644
+index a28e4db075ede..12e725e34c6ca 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -776,6 +776,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -144,10 +144,10 @@ index 85b5f7bea82e..c742051ba969 100644
   * vfsmount lock must be held for write
   */
 diff --git a/fs/read_write.c b/fs/read_write.c
-index 59d819c5b92e..bcb853105beb 100644
+index bbfa9b12b15eb..5d684d7d29207 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -498,6 +498,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
+@@ -499,6 +499,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
  		return -EINVAL;
  }
  
@@ -177,7 +177,7 @@ index 59d819c5b92e..bcb853105beb 100644
  {
  	mm_segment_t old_fs;
 diff --git a/fs/splice.c b/fs/splice.c
-index d671936d0aad..b1f536d03c09 100644
+index 4e53efbd621db..9f230ee854e20 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -849,8 +849,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
@@ -205,7 +205,7 @@ index d671936d0aad..b1f536d03c09 100644
  	ssize_t (*splice_read)(struct file *, loff_t *,
  			       struct pipe_inode_info *, size_t, unsigned int);
 diff --git a/fs/sync.c b/fs/sync.c
-index 4d1ff010bc5a..457f4e4a5cc1 100644
+index 4d1ff010bc5af..457f4e4a5cc1f 100644
 --- a/fs/sync.c
 +++ b/fs/sync.c
 @@ -28,7 +28,7 @@
@@ -218,10 +218,10 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644
  	if (wait)
  		sync_inodes_sb(sb);
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 3cd4fe6b845e..6d1e37a014f3 100644
+index 45cc10cdf6ddd..916efd7e612b3 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1349,6 +1349,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1355,6 +1355,7 @@ extern void fasync_free(struct fasync_struct *);
  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  
@@ -229,7 +229,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644
  extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
  extern int f_setown(struct file *filp, unsigned long arg, int force);
  extern void f_delown(struct file *filp);
-@@ -1841,6 +1842,7 @@ struct file_operations {
+@@ -1847,6 +1848,7 @@ struct file_operations {
  	ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
  	unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
  	int (*check_flags)(int);
@@ -237,7 +237,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644
  	int (*flock) (struct file *, int, struct file_lock *);
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
  	ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
-@@ -1911,6 +1913,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -1917,6 +1919,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
  			      struct iovec *fast_pointer,
  			      struct iovec **ret_pointer);
  
@@ -250,7 +250,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644
  extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
  extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
  extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -2343,6 +2351,7 @@ extern int current_umask(void);
+@@ -2349,6 +2357,7 @@ extern int current_umask(void);
  extern void ihold(struct inode * inode);
  extern void iput(struct inode *);
  extern int generic_update_time(struct inode *, struct timespec64 *, int);
@@ -258,7 +258,7 @@ index 3cd4fe6b845e..6d1e37a014f3 100644
  
  /* /sys/fs */
  extern struct kobject *fs_kobj;
-@@ -2627,6 +2636,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2633,6 +2642,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
  	return false;
  }
  #endif
@@ -267,10 +267,10 @@ index 3cd4fe6b845e..6d1e37a014f3 100644
  extern const struct file_operations def_blk_fops;
  extern const struct file_operations def_chr_fops;
 diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index 664f52c6dd4c..f2208851f527 100644
+index 206774ac69460..e5eda5226fbc7 100644
 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
-@@ -331,6 +331,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
+@@ -376,6 +376,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
  	return lock->key == key;
  }
  
@@ -279,7 +279,7 @@ index 664f52c6dd4c..f2208851f527 100644
  /*
   * Acquire a lock.
   *
-@@ -472,6 +474,7 @@ struct lockdep_map { };
+@@ -521,6 +523,7 @@ struct lockdep_map { };
  
  #define lockdep_depth(tsk)	(0)
  
@@ -288,7 +288,7 @@ index 664f52c6dd4c..f2208851f527 100644
  
  #define lockdep_assert_held(l)			do { (void)(l); } while (0)
 diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
-index 35942084cd40..24f5fd1a789d 100644
+index 35942084cd40d..24f5fd1a789de 100644
 --- a/include/linux/mnt_namespace.h
 +++ b/include/linux/mnt_namespace.h
 @@ -6,11 +6,14 @@
@@ -307,10 +307,10 @@ index 35942084cd40..24f5fd1a789d 100644
  extern const struct file_operations proc_mountinfo_operations;
  extern const struct file_operations proc_mountstats_operations;
 diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 74b4911ac16d..19789fbea567 100644
+index ebbbfea48aa0b..d68d574250283 100644
 --- a/include/linux/splice.h
 +++ b/include/linux/splice.h
-@@ -87,4 +87,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
+@@ -90,4 +90,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
  
  extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
  extern const struct pipe_buf_operations default_pipe_buf_ops;
@@ -322,10 +322,10 @@ index 74b4911ac16d..19789fbea567 100644
 +			 unsigned int flags);
  #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 32406ef0d6a2..e52169c2086b 100644
+index ac10db66cc63f..837a3358e77ca 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -153,7 +153,7 @@ static
+@@ -169,7 +169,7 @@ static
  struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
  static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
  
@@ -334,7 +334,7 @@ index 32406ef0d6a2..e52169c2086b 100644
  {
  	unsigned int class_idx = hlock->class_idx;
  
-@@ -174,6 +174,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
+@@ -190,6 +190,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
  	 */
  	return lock_classes + class_idx;
  }
@@ -346,10 +346,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index c7c64272b0fa..76d99aea5ae2 100644
+index eb2255e95f62b..92f6062423c0c 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2128,7 +2128,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2162,7 +2162,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) {
@@ -359,7 +359,7 @@ index c7c64272b0fa..76d99aea5ae2 100644
  		rc = 0;
  	}
 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index 14c2badb8fd9..65afe5287e43 100644
+index 14c2badb8fd93..65afe5287e43e 100644
 --- a/fs/proc/nommu.c
 +++ b/fs/proc/nommu.c
 @@ -41,7 +41,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
@@ -375,10 +375,10 @@ index 14c2badb8fd9..65afe5287e43 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 3ba9ae83bff5..397c33e0acbe 100644
+index 8d382d4ec0672..93a768f754c91 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
-@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
  	const char *name = NULL;
  
  	if (file) {
@@ -390,7 +390,7 @@ index 3ba9ae83bff5..397c33e0acbe 100644
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1819,7 +1822,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1787,7 +1790,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;
@@ -400,7 +400,7 @@ index 3ba9ae83bff5..397c33e0acbe 100644
  	struct mempolicy *pol;
  	char buffer[64];
 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 7907e6419e57..d17209cf52bc 100644
+index 7907e6419e572..d17209cf52bc3 100644
 --- a/fs/proc/task_nommu.c
 +++ b/fs/proc/task_nommu.c
 @@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
@@ -416,10 +416,10 @@ index 7907e6419e57..d17209cf52bc 100644
  		ino = inode->i_ino;
  		pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 52269e56c514..32aa6b1ea1d2 100644
+index f3fe7371855ce..a5b9751a5b331 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1487,6 +1487,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1688,6 +1688,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
  	unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  
@@ -449,10 +449,10 @@ index 52269e56c514..32aa6b1ea1d2 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 c28911c3afa8..23d069c0e171 100644
+index 4aba6c0c2ba80..974802987f69d 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -267,6 +267,7 @@ struct vm_region {
+@@ -272,6 +272,7 @@ struct vm_region {
  	unsigned long	vm_top;		/* region allocated to here */
  	unsigned long	vm_pgoff;	/* the offset in vm_file corresponding to vm_start */
  	struct file	*vm_file;	/* the backing file or NULL */
@@ -460,7 +460,7 @@ index c28911c3afa8..23d069c0e171 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
-@@ -346,6 +347,7 @@ struct vm_area_struct {
+@@ -351,6 +352,7 @@ struct vm_area_struct {
  	unsigned long vm_pgoff;		/* Offset (within vm_file) in PAGE_SIZE
  					   units */
  	struct file * vm_file;		/* File we map to (can be NULL). */
@@ -469,10 +469,10 @@ index c28911c3afa8..23d069c0e171 100644
  
  #ifdef CONFIG_SWAP
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 60a1295f4384..44682dd97ca6 100644
+index 48ed22774efaa..d7439388c1c52 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -565,7 +565,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -568,7 +568,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
  			struct inode *inode = file_inode(file);
  			struct address_space *mapping = file->f_mapping;
  
@@ -482,10 +482,10 @@ index 60a1295f4384..44682dd97ca6 100644
  				atomic_dec(&inode->i_writecount);
  			i_mmap_lock_write(mapping);
 diff --git a/mm/Makefile b/mm/Makefile
-index 272e66039e70..c8ff3d955c27 100644
+index fccd3756b25f0..51485ceec650a 100644
 --- a/mm/Makefile
 +++ b/mm/Makefile
-@@ -43,7 +43,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
+@@ -44,7 +44,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o fadvise.o \
  			   mm_init.o mmu_context.o percpu.o slab_common.o \
  			   compaction.o vmacache.o \
  			   interval_tree.o list_lru.o workingset.o \
@@ -495,10 +495,10 @@ index 272e66039e70..c8ff3d955c27 100644
  # Give 'page_alloc' its own module-parameter namespace
  page-alloc-y := page_alloc.o
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 1784478270e1..fb03735cd00e 100644
+index 23a051a7ef0fb..e2fe9132feb21 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -2653,7 +2653,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -2660,7 +2660,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
  	vm_fault_t ret = VM_FAULT_LOCKED;
  
  	sb_start_pagefault(inode->i_sb);
@@ -508,10 +508,10 @@ index 1784478270e1..fb03735cd00e 100644
  	if (page->mapping != inode->i_mapping) {
  		unlock_page(page);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index d681a20eb4ea..36c80ae89cee 100644
+index f609e9ec4a253..d554b349c653c 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
-@@ -176,7 +176,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
@@ -520,7 +520,7 @@ index d681a20eb4ea..36c80ae89cee 100644
  	mpol_put(vma_policy(vma));
  	vm_area_free(vma);
  	return next;
-@@ -907,7 +907,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
+@@ -910,7 +910,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
  	if (remove_next) {
  		if (file) {
  			uprobe_munmap(next, next->vm_start, next->vm_end);
@@ -529,7 +529,7 @@ index d681a20eb4ea..36c80ae89cee 100644
  		}
  		if (next->anon_vma)
  			anon_vma_merge(vma, next);
-@@ -1829,8 +1829,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1831,8 +1831,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  	return addr;
  
  unmap_and_free_vma:
@@ -539,7 +539,7 @@ index d681a20eb4ea..36c80ae89cee 100644
  
  	/* Undo any partial mapping done by a device driver. */
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2659,7 +2659,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2683,7 +2683,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  		goto out_free_mpol;
  
  	if (new->vm_file)
@@ -548,7 +548,7 @@ index d681a20eb4ea..36c80ae89cee 100644
  
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
-@@ -2678,7 +2678,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2702,7 +2702,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  	if (new->vm_ops && new->vm_ops->close)
  		new->vm_ops->close(new);
  	if (new->vm_file)
@@ -557,7 +557,7 @@ index d681a20eb4ea..36c80ae89cee 100644
  	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
-@@ -2870,7 +2870,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2894,7 +2894,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  	struct vm_area_struct *vma;
  	unsigned long populate = 0;
  	unsigned long ret = -EINVAL;
@@ -566,7 +566,7 @@ index d681a20eb4ea..36c80ae89cee 100644
  
  	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
  		     current->comm, current->pid);
-@@ -2945,10 +2945,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2969,10 +2969,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  		}
  	}
  
@@ -595,7 +595,7 @@ index d681a20eb4ea..36c80ae89cee 100644
  out:
  	up_write(&mm->mmap_sem);
  	if (populate)
-@@ -3239,7 +3256,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3263,7 +3280,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)
@@ -605,10 +605,10 @@ index d681a20eb4ea..36c80ae89cee 100644
  			new_vma->vm_ops->open(new_vma);
  		vma_link(mm, new_vma, prev, rb_link, rb_parent);
 diff --git a/mm/nommu.c b/mm/nommu.c
-index bd2b4e5ef144..acdab5253263 100644
+index 318df4e236c99..7f051e86ea1dd 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -563,7 +563,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -567,7 +567,7 @@ static void __put_nommu_region(struct vm_region *region)
  		up_write(&nommu_region_sem);
  
  		if (region->vm_file)
@@ -617,7 +617,7 @@ index bd2b4e5ef144..acdab5253263 100644
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -695,7 +695,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -699,7 +699,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)
@@ -626,7 +626,7 @@ index bd2b4e5ef144..acdab5253263 100644
  	put_nommu_region(vma->vm_region);
  	vm_area_free(vma);
  }
-@@ -1218,7 +1218,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1222,7 +1222,7 @@ unsigned long do_mmap(struct file *file,
  					goto error_just_free;
  				}
  			}
@@ -635,7 +635,7 @@ index bd2b4e5ef144..acdab5253263 100644
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1295,10 +1295,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1299,10 +1299,10 @@ unsigned long do_mmap(struct file *file,
  	up_write(&nommu_region_sem);
  error:
  	if (region->vm_file)
@@ -650,7 +650,7 @@ index bd2b4e5ef144..acdab5253263 100644
  
 diff --git a/mm/prfile.c b/mm/prfile.c
 new file mode 100644
-index 000000000000..00d51187c325
+index 0000000000000..00d51187c3250
 --- /dev/null
 +++ b/mm/prfile.c
 @@ -0,0 +1,86 @@
@@ -744,7 +744,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 046000653e4d..15aa871d1b45 100644
+index 046000653e4d8..15aa871d1b450 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1371,6 +1371,7 @@ void d_walk(struct dentry *parent, void *data,
@@ -764,7 +764,7 @@ index 046000653e4d..15aa871d1b45 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index db17be51b112..4bb61917a29a 100644
+index 2c465119affcc..239bcb8906e78 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
@@ -776,7 +776,7 @@ index db17be51b112..4bb61917a29a 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index b0935c67bd1e..07251ba86c31 100644
+index 0b28a37f7e505..f2c90a416b751 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
@@ -788,7 +788,7 @@ index b0935c67bd1e..07251ba86c31 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 30d55c9a1744..34b9bbf4c556 100644
+index 30d55c9a1744a..34b9bbf4c5566 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
 @@ -162,6 +162,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
@@ -808,10 +808,10 @@ index 30d55c9a1744..34b9bbf4c556 100644
  void __init files_init(void)
  {
 diff --git a/fs/inode.c b/fs/inode.c
-index c5a5578773d4..5995e737f64a 100644
+index 7700c5e4783b9..6284b41fcf3f0 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1693,6 +1693,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
+@@ -1694,6 +1694,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
  		return inode->i_op->update_time(inode, time, flags);
  	return generic_update_time(inode, time, flags);
  }
@@ -820,7 +820,7 @@ index c5a5578773d4..5995e737f64a 100644
  /**
   *	touch_atime	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index c742051ba969..e02a680b7fe9 100644
+index 12e725e34c6ca..fa17b9d5926ba 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -848,7 +848,7 @@ index c742051ba969..e02a680b7fe9 100644
  static void lock_mnt_tree(struct mount *mnt)
  {
 diff --git a/fs/notify/group.c b/fs/notify/group.c
-index 133f723aca07..0b9f7f6d8390 100644
+index 133f723aca070..0b9f7f6d8390f 100644
 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
 @@ -99,6 +99,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
@@ -860,7 +860,7 @@ index 133f723aca07..0b9f7f6d8390 100644
  /*
   * Drop a reference to a group.  Free it if it's through.
 diff --git a/fs/open.c b/fs/open.c
-index 0788b3715731..cec8ceac6f16 100644
+index 719b320ede52b..f88ce55c1c998 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@@ -872,10 +872,10 @@ index 0788b3715731..cec8ceac6f16 100644
  long vfs_truncate(const struct path *path, loff_t length)
  {
 diff --git a/fs/read_write.c b/fs/read_write.c
-index bcb853105beb..e54db6078e3f 100644
+index 5d684d7d29207..6f61c0b6aa664 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
+@@ -469,6 +469,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
  
  	return ret;
  }
@@ -883,7 +883,7 @@ index bcb853105beb..e54db6078e3f 100644
  
  static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
  {
-@@ -508,6 +509,7 @@ vfs_readf_t vfs_readf(struct file *file)
+@@ -509,6 +510,7 @@ vfs_readf_t vfs_readf(struct file *file)
  		return new_sync_read;
  	return ERR_PTR(-ENOSYS); /* doesn't have ->read(|_iter)() op */
  }
@@ -891,7 +891,7 @@ index bcb853105beb..e54db6078e3f 100644
  
  vfs_writef_t vfs_writef(struct file *file)
  {
-@@ -519,6 +521,7 @@ vfs_writef_t vfs_writef(struct file *file)
+@@ -520,6 +522,7 @@ vfs_writef_t vfs_writef(struct file *file)
  		return new_sync_write;
  	return ERR_PTR(-ENOSYS); /* doesn't have ->write(|_iter)() op */
  }
@@ -899,7 +899,7 @@ index bcb853105beb..e54db6078e3f 100644
  
  ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
  {
-@@ -588,6 +591,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
+@@ -589,6 +592,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
  
  	return ret;
  }
@@ -908,7 +908,7 @@ index bcb853105beb..e54db6078e3f 100644
  /* file_ppos returns &file->f_pos or NULL if file is stream */
  static inline loff_t *file_ppos(struct file *file)
 diff --git a/fs/splice.c b/fs/splice.c
-index b1f536d03c09..0872306175b4 100644
+index 9f230ee854e20..a6bd05004433c 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -862,6 +862,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
@@ -928,7 +928,7 @@ index b1f536d03c09..0872306175b4 100644
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/fs/sync.c b/fs/sync.c
-index 457f4e4a5cc1..67c66358f3fe 100644
+index 457f4e4a5cc1f..67c66358f3fe4 100644
 --- a/fs/sync.c
 +++ b/fs/sync.c
 @@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
@@ -940,7 +940,7 @@ index 457f4e4a5cc1..67c66358f3fe 100644
  /*
   * Write out and wait upon all dirty data associated with this
 diff --git a/fs/xattr.c b/fs/xattr.c
-index 90dd78f0eb27..40b01dd1b14a 100644
+index 91608d9bfc6aa..02d19ab3ba540 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
 @@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
@@ -952,10 +952,10 @@ index 90dd78f0eb27..40b01dd1b14a 100644
  ssize_t
  __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index e52169c2086b..d9bc5cbe9078 100644
+index 837a3358e77ca..715ba9c1b91ae 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -174,6 +174,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+@@ -190,6 +190,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
  	 */
  	return lock_classes + class_idx;
  }
@@ -964,19 +964,19 @@ index e52169c2086b..d9bc5cbe9078 100644
  
  #ifdef CONFIG_LOCK_STAT
 diff --git a/kernel/task_work.c b/kernel/task_work.c
-index 0fef395662a6..83fb1ecfc33d 100644
+index 825f28259a19a..b77593b29c1a5 100644
 --- a/kernel/task_work.c
 +++ b/kernel/task_work.c
-@@ -116,3 +116,4 @@ void task_work_run(void)
+@@ -126,3 +126,4 @@ void task_work_run(void)
  		} while (work);
  	}
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/security.c b/security/security.c
-index 565bc9b67276..248a63945e9f 100644
+index 51de970fbb1ed..b21f1ffd90051 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -1068,6 +1068,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -1087,6 +1087,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
  		return 0;
  	return call_int_hook(path_rmdir, 0, dir, dentry);
  }
@@ -984,7 +984,7 @@ index 565bc9b67276..248a63945e9f 100644
  
  int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {
-@@ -1084,6 +1085,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1103,6 +1104,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);
  }
@@ -992,7 +992,7 @@ index 565bc9b67276..248a63945e9f 100644
  
  int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -1092,6 +1094,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1111,6 +1113,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);
  }
@@ -1000,7 +1000,7 @@ index 565bc9b67276..248a63945e9f 100644
  
  int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
  			 const struct path *new_dir, struct dentry *new_dentry,
-@@ -1119,6 +1122,7 @@ int security_path_truncate(const struct path *path)
+@@ -1138,6 +1141,7 @@ int security_path_truncate(const struct path *path)
  		return 0;
  	return call_int_hook(path_truncate, 0, path);
  }
@@ -1008,7 +1008,7 @@ index 565bc9b67276..248a63945e9f 100644
  
  int security_path_chmod(const struct path *path, umode_t mode)
  {
-@@ -1126,6 +1130,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1145,6 +1149,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
  		return 0;
  	return call_int_hook(path_chmod, 0, path, mode);
  }
@@ -1016,7 +1016,7 @@ index 565bc9b67276..248a63945e9f 100644
  
  int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {
-@@ -1133,6 +1138,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1152,6 +1157,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  		return 0;
  	return call_int_hook(path_chown, 0, path, uid, gid);
  }
@@ -1024,7 +1024,7 @@ index 565bc9b67276..248a63945e9f 100644
  
  int security_path_chroot(const struct path *path)
  {
-@@ -1233,6 +1239,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -1252,6 +1258,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return call_int_hook(inode_permission, 0, inode, mask);
  }
@@ -1032,7 +1032,7 @@ index 565bc9b67276..248a63945e9f 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -1410,6 +1417,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -1429,6 +1436,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -3006,8 +3006,8 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
 +#endif /* __AUFS_H__ */
 diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 --- /usr/share/empty/fs/aufs/branch.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c	2020-01-27 10:57:18.165538015 +0100
-@@ -0,0 +1,1428 @@
++++ linux/fs/aufs/branch.c	2020-08-03 09:14:46.095748745 +0200
+@@ -0,0 +1,1427 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -4300,11 +4300,10 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +		spin_unlock(&hf->f_lock);
 +		if (writer) {
 +			h_inode = file_inode(hf);
++			if (hf->f_mode & FMODE_READ)
++				i_readcount_inc(h_inode);
 +			put_write_access(h_inode);
 +			__mnt_drop_write(hf->f_path.mnt);
-+			if ((hf->f_mode & (FMODE_READ | FMODE_WRITE))
-+			    == FMODE_READ)
-+				i_readcount_inc(h_inode);
 +		}
 +	}
 +
@@ -10805,7 +10804,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +};
 diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 --- /usr/share/empty/fs/aufs/dir.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.h	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dir.h	2020-08-03 09:14:46.095748745 +0200
 @@ -0,0 +1,134 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -10847,7 +10846,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 +
 +struct au_vdir_destr {
 +	unsigned char	len;
-+	unsigned char	name[0];
++	unsigned char	name[];
 +} __packed;
 +
 +struct au_vdir_dehstr {
@@ -10943,7 +10942,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 +#endif /* __AUFS_DIR_H__ */
 diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
 --- /usr/share/empty/fs/aufs/dirren.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.c	2020-01-27 10:57:18.168871450 +0100
++++ linux/fs/aufs/dirren.c	2020-08-03 09:14:46.095748745 +0200
 @@ -0,0 +1,1316 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -11531,7 +11530,7 @@ diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
 +struct au_drinfo_rev {
 +	unsigned char			already;
 +	aufs_bindex_t			nelm;
-+	struct au_drinfo_rev_elm	elm[0];
++	struct au_drinfo_rev_elm	elm[];
 +};
 +
 +/* todo: isn't it too large? */
@@ -18693,7 +18692,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
 +}
 diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 --- /usr/share/empty/fs/aufs/inode.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h	2020-01-27 10:57:18.175538316 +0100
++++ linux/fs/aufs/inode.h	2020-08-03 09:14:46.095748745 +0200
 @@ -0,0 +1,698 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -18904,8 +18903,8 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 +int au_pin_and_icpup(struct dentry *dentry, struct iattr *ia,
 +		     struct au_icpup_args *a);
 +
-+int au_h_path_getattr(struct dentry *dentry, int force, struct path *h_path,
-+		      int locked);
++int au_h_path_getattr(struct dentry *dentry, struct inode *inode, int force,
++		      struct path *h_path, int locked);
 +
 +/* i_op_add.c */
 +int au_may_add(struct dentry *dentry, aufs_bindex_t bindex,
@@ -20559,8 +20558,8 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 --- /usr/share/empty/fs/aufs/i_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c	2020-01-27 10:57:18.172204883 +0100
-@@ -0,0 +1,1498 @@
++++ linux/fs/aufs/i_op.c	2020-08-03 09:14:46.095748745 +0200
+@@ -0,0 +1,1502 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -21743,15 +21742,14 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 + * returns zero or negative (an error).
 + * @dentry will be read-locked in success.
 + */
-+int au_h_path_getattr(struct dentry *dentry, int force, struct path *h_path,
-+		      int locked)
++int au_h_path_getattr(struct dentry *dentry, struct inode *inode, int force,
++		      struct path *h_path, int locked)
 +{
 +	int err;
 +	unsigned int mnt_flags, sigen;
 +	unsigned char udba_none;
 +	aufs_bindex_t bindex;
 +	struct super_block *sb, *h_sb;
-+	struct inode *inode;
 +
 +	h_path->mnt = NULL;
 +	h_path->dentry = NULL;
@@ -21792,7 +21790,11 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 +		di_read_lock_child(dentry, AuLock_IR);
 +
 +body:
-+	inode = d_inode(dentry);
++	if (!inode) {
++		inode = d_inode(dentry);
++		if (unlikely(!inode))
++			goto out;
++	}
 +	bindex = au_ibtop(inode);
 +	h_path->mnt = au_sbr_mnt(sb, bindex);
 +	h_sb = h_path->mnt->mnt_sb;
@@ -21832,7 +21834,8 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 +	err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
 +	if (unlikely(err))
 +		goto out;
-+	err = au_h_path_getattr(dentry, /*force*/0, &h_path, /*locked*/0);
++	err = au_h_path_getattr(dentry, /*inode*/NULL, /*force*/0, &h_path,
++				/*locked*/0);
 +	if (unlikely(err))
 +		goto out_si;
 +	if (unlikely(!h_path.dentry))
@@ -28475,7 +28478,7 @@ diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
 +}
 diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
 --- /usr/share/empty/fs/aufs/procfs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c	2020-03-30 09:50:57.598730603 +0200
++++ linux/fs/aufs/procfs.c	2020-08-03 09:14:43.142321747 +0200
 @@ -0,0 +1,170 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -32710,8 +32713,8 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 --- /usr/share/empty/fs/aufs/vfsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c	2020-01-27 10:57:18.178871751 +0100
-@@ -0,0 +1,902 @@
++++ linux/fs/aufs/vfsub.c	2020-08-03 09:14:46.095748745 +0200
+@@ -0,0 +1,895 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2020 Junjiro R. Okajima
@@ -32790,15 +32793,8 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 +
 +struct file *vfsub_dentry_open(struct path *path, int flags)
 +{
-+	struct file *file;
-+
-+	file = dentry_open(path, flags /* | __FMODE_NONOTIFY */,
++	return dentry_open(path, flags /* | __FMODE_NONOTIFY */,
 +			   current_cred());
-+	if (!IS_ERR_OR_NULL(file)
-+	    && (file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
-+		i_readcount_inc(d_inode(path->dentry));
-+
-+	return file;
 +}
 +
 +struct file *vfsub_filp_open(const char *path, int oflags, int mode)
@@ -35964,7 +35960,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
 +#endif /* __AUFS_WHOUT_H__ */
 diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
 --- /usr/share/empty/fs/aufs/wkq.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c	2020-01-27 10:57:18.178871751 +0100
++++ linux/fs/aufs/wkq.c	2020-08-03 09:12:33.764880472 +0200
 @@ -0,0 +1,372 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -36433,7 +36429,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
 +#endif /* __AUFS_WKQ_H__ */
 diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 --- /usr/share/empty/fs/aufs/xattr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c	2020-01-27 10:57:18.182205184 +0100
++++ linux/fs/aufs/xattr.c	2020-08-03 09:14:46.095748745 +0200
 @@ -0,0 +1,356 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -36631,7 +36627,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +
 +static int au_smack_reentering(struct super_block *sb)
 +{
-+#if IS_ENABLED(CONFIG_SECURITY_SMACK)
++#if IS_ENABLED(CONFIG_SECURITY_SMACK) || IS_ENABLED(CONFIG_SECURITY_SELINUX)
 +	/*
 +	 * as a part of lookup, smack_d_instantiate() is called, and it calls
 +	 * i_op->getxattr(). ouch.
@@ -36662,7 +36658,8 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +	} u;
 +};
 +
-+static ssize_t au_lgxattr(struct dentry *dentry, struct au_lgxattr *arg)
++static ssize_t au_lgxattr(struct dentry *dentry, struct inode *inode,
++			  struct au_lgxattr *arg)
 +{
 +	ssize_t err;
 +	int reenter;
@@ -36676,7 +36673,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +		if (unlikely(err))
 +			goto out;
 +	}
-+	err = au_h_path_getattr(dentry, /*force*/1, &h_path, reenter);
++	err = au_h_path_getattr(dentry, inode, /*force*/1, &h_path, reenter);
 +	if (unlikely(err))
 +		goto out_si;
 +	if (unlikely(!h_path.dentry))
@@ -36718,11 +36715,10 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +		},
 +	};
 +
-+	return au_lgxattr(dentry, &arg);
++	return au_lgxattr(dentry, /*inode*/NULL, &arg);
 +}
 +
-+static ssize_t au_getxattr(struct dentry *dentry,
-+			   struct inode *inode __maybe_unused,
++static ssize_t au_getxattr(struct dentry *dentry, struct inode *inode,
 +			   const char *name, void *value, size_t size)
 +{
 +	struct au_lgxattr arg = {
@@ -36734,7 +36730,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +		},
 +	};
 +
-+	return au_lgxattr(dentry, &arg);
++	return au_lgxattr(dentry, inode, &arg);
 +}
 +
 +static int au_setxattr(struct dentry *dentry, struct inode *inode,
@@ -36793,7 +36789,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +}
 diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 --- /usr/share/empty/fs/aufs/xino.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c	2020-03-30 09:50:57.598730603 +0200
++++ linux/fs/aufs/xino.c	2020-04-03 08:16:49.834195677 +0200
 @@ -0,0 +1,1966 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -38763,7 +38759,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +}
 diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
 --- /usr/share/empty/include/uapi/linux/aufs_type.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h	2020-03-30 09:50:57.598730603 +0200
++++ linux/include/uapi/linux/aufs_type.h	2020-08-03 09:14:46.095748745 +0200
 @@ -0,0 +1,452 @@
 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +/*
@@ -38807,7 +38803,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +#include <limits.h>
 +#endif /* __KERNEL__ */
 +
-+#define AUFS_VERSION	"5.x-rcN-20200302"
++#define AUFS_VERSION	"5.x-rcN-20200622"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39054,7 +39050,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +	uint8_t		type;
 +	uint8_t		nlen;
 +	uint8_t		wh;
-+	char		name[0];
++	char		name[];
 +} __aligned(8);
 +
 +static inline int au_rdu_len(int nlen)
@@ -39105,7 +39101,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +		uint8_t oldnamelen;
 +		uint64_t _padding;
 +	};
-+	uint8_t oldname[0];
++	uint8_t oldname[];
 +} __aligned(8);
 +
 +struct au_drinfo_fdata {
@@ -39199,7 +39195,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +	struct {
 +		int16_t	id;
 +		int	perm;
-+		char	path[0];
++		char	path[];
 +	};
 +} __aligned(8);
 +
@@ -39221,10 +39217,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN loopback patch
 
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 872e3b3a7693..768100025129 100644
+index 0479902a0cd50..758c8ee4d4e6b 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -635,6 +635,15 @@ static inline void loop_update_dio(struct loop_device *lo)
+@@ -638,6 +638,15 @@ static inline void loop_update_dio(struct loop_device *lo)
  			lo->use_dio);
  }
  
@@ -39240,7 +39236,7 @@ index 872e3b3a7693..768100025129 100644
  static void loop_reread_partitions(struct loop_device *lo,
  				   struct block_device *bdev)
  {
-@@ -690,6 +699,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -693,6 +702,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  			  unsigned int arg)
  {
  	struct file	*file = NULL, *old_file;
@@ -39248,7 +39244,7 @@ index 872e3b3a7693..768100025129 100644
  	int		error;
  	bool		partscan;
  
-@@ -709,12 +719,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -712,12 +722,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	file = fget(arg);
  	if (!file)
  		goto out_err;
@@ -39268,7 +39264,7 @@ index 872e3b3a7693..768100025129 100644
  
  	error = -EINVAL;
  
-@@ -726,6 +743,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -729,6 +746,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	blk_mq_freeze_queue(lo->lo_queue);
  	mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
  	lo->lo_backing_file = file;
@@ -39276,7 +39272,7 @@ index 872e3b3a7693..768100025129 100644
  	lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
  	mapping_set_gfp_mask(file->f_mapping,
  			     lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
-@@ -739,6 +757,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -742,6 +760,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	 * dependency.
  	 */
  	fput(old_file);
@@ -39285,7 +39281,7 @@ index 872e3b3a7693..768100025129 100644
  	if (partscan)
  		loop_reread_partitions(lo, bdev);
  	return 0;
-@@ -747,6 +767,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -750,6 +770,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
  	mutex_unlock(&loop_ctl_mutex);
  	if (file)
  		fput(file);
@@ -39294,7 +39290,7 @@ index 872e3b3a7693..768100025129 100644
  	return error;
  }
  
-@@ -951,7 +973,7 @@ static void loop_update_rotational(struct loop_device *lo)
+@@ -973,7 +995,7 @@ static void loop_update_rotational(struct loop_device *lo)
  static int loop_set_fd(struct loop_device *lo, fmode_t mode,
  		       struct block_device *bdev, unsigned int arg)
  {
@@ -39303,7 +39299,7 @@ index 872e3b3a7693..768100025129 100644
  	struct inode	*inode;
  	struct address_space *mapping;
  	struct block_device *claimed_bdev = NULL;
-@@ -967,6 +989,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -989,6 +1011,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
  	file = fget(arg);
  	if (!file)
  		goto out;
@@ -39316,7 +39312,7 @@ index 872e3b3a7693..768100025129 100644
  
  	/*
  	 * If we don't hold exclusive handle for the device, upgrade to it
-@@ -1015,6 +1043,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -1037,6 +1065,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
  	lo->lo_device = bdev;
  	lo->lo_flags = lo_flags;
  	lo->lo_backing_file = file;
@@ -39324,7 +39320,7 @@ index 872e3b3a7693..768100025129 100644
  	lo->transfer = NULL;
  	lo->ioctl = NULL;
  	lo->lo_sizelimit = 0;
-@@ -1068,6 +1097,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -1090,6 +1119,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
  		bd_abort_claiming(bdev, claimed_bdev, loop_set_fd);
  out_putf:
  	fput(file);
@@ -39333,7 +39329,7 @@ index 872e3b3a7693..768100025129 100644
  out:
  	/* This is safe: open() is still holding a reference. */
  	module_put(THIS_MODULE);
-@@ -1114,6 +1145,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
+@@ -1136,6 +1167,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
  static int __loop_clr_fd(struct loop_device *lo, bool release)
  {
  	struct file *filp = NULL;
@@ -39341,7 +39337,7 @@ index 872e3b3a7693..768100025129 100644
  	gfp_t gfp = lo->old_gfp_mask;
  	struct block_device *bdev = lo->lo_device;
  	int err = 0;
-@@ -1137,6 +1169,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1159,6 +1191,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
  
  	spin_lock_irq(&lo->lo_lock);
  	lo->lo_backing_file = NULL;
@@ -39349,7 +39345,7 @@ index 872e3b3a7693..768100025129 100644
  	spin_unlock_irq(&lo->lo_lock);
  
  	loop_release_xfer(lo);
-@@ -1220,6 +1253,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1242,6 +1275,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
  	 */
  	if (filp)
  		fput(filp);
@@ -39359,7 +39355,7 @@ index 872e3b3a7693..768100025129 100644
  }
  
 diff --git a/drivers/block/loop.h b/drivers/block/loop.h
-index af75a5ee4094..1d847cb194ff 100644
+index af75a5ee40944..1d847cb194ff6 100644
 --- a/drivers/block/loop.h
 +++ b/drivers/block/loop.h
 @@ -46,7 +46,7 @@ struct loop_device {
@@ -39372,7 +39368,7 @@ index af75a5ee4094..1d847cb194ff 100644
  	void		*key_data; 
  
 diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 6fb4a4ed8cc7..ba9a959f2db2 100644
+index 6fb4a4ed8cc7f..ba9a959f2db27 100644
 --- a/fs/aufs/f_op.c
 +++ b/fs/aufs/f_op.c
 @@ -359,7 +359,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
@@ -39385,7 +39381,7 @@ index 6fb4a4ed8cc7..ba9a959f2db2 100644
  		if (file->f_mapping != h_file->f_mapping) {
  			file->f_mapping = h_file->f_mapping;
 diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
-index a8b63acc6204..9d97c3af5686 100644
+index a8b63acc62045..9d97c3af5686a 100644
 --- a/fs/aufs/loop.c
 +++ b/fs/aufs/loop.c
 @@ -133,3 +133,19 @@ void au_loopback_fin(void)
@@ -39409,7 +39405,7 @@ index a8b63acc6204..9d97c3af5686 100644
 +	return f;
 +}
 diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index 94f4f80ae33b..ca1194354aff 100644
+index 94f4f80ae33bf..ca1194354aff4 100644
 --- a/fs/aufs/loop.h
 +++ b/fs/aufs/loop.h
 @@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
@@ -39431,7 +39427,7 @@ index 94f4f80ae33b..ca1194354aff 100644
  
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 589dd0122020..801e0a7faec5 100644
+index 589dd01220201..801e0a7faec59 100644
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
 @@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {
@@ -39447,10 +39443,10 @@ index 589dd0122020..801e0a7faec5 100644
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 6d1e37a014f3..ce2c9b4bae13 100644
+index 916efd7e612b3..68f536f42b2a0 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1979,6 +1979,10 @@ struct super_operations {
+@@ -1985,6 +1985,10 @@ struct super_operations {
  				  struct shrink_control *);
  	long (*free_cached_objects)(struct super_block *,
  				    struct shrink_control *);
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 76f254ce..4e365cad 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -7,7 +7,6 @@ ARCH_MEMORY_PROBE all=n
 COMPAT_32BIT_TIME all=y
 DEBUG_ENTRY all=n
 DEBUG_IMR_SELFTEST all=n
-DEBUG_WX all=y
 EARLY_PRINTK_USB_XDBC all=n
 EFI_MIXED all=y
 EFI_PGT_DUMP all=n
@@ -19,7 +18,6 @@ JAILHOUSE_GUEST all=y
 KEXEC_FILE all=y
 KEXEC_SIG all=n
 KVM_AMD_SEV all=y
-KVM_DEBUG_FS all=n
 LOCK_EVENT_COUNTS all=n
 MICROCODE_OLD_INTERFACE all=n
 PERF_EVENTS_AMD_POWER all=m
@@ -65,6 +63,8 @@ BLK_CGROUP_IOCOST all=y
 BLK_WBT_MQ all=y
 BLK_DEBUG_FS all=y
 BLK_SED_OPAL all=y
+BLK_INLINE_ENCRYPTION all=y
+BLK_INLINE_ENCRYPTION_FALLBACK all=y
 #- file block/partitions/Kconfig goes here
 #- file block/Kconfig.iosched goes here
 
@@ -603,6 +603,7 @@ XEN_BLKDEV_BACKEND all=m
 VIRTIO_BLK all=m
 BLK_DEV_RBD all=m
 BLK_DEV_RSXX all=m
+#- file drivers/block/rnbd/Kconfig goes here
 
 #-
 #- *** FILE: drivers/block/drbd/Kconfig ***
@@ -643,6 +644,12 @@ PARIDE_KTTI all=m
 PARIDE_ON20 all=m
 PARIDE_ON26 all=m
 
+#-
+#- *** FILE: drivers/block/rnbd/Kconfig ***
+#-
+BLK_DEV_RNBD_CLIENT all=m
+BLK_DEV_RNBD_SERVER all=m
+
 #-
 #- *** FILE: drivers/block/zram/Kconfig ***
 #-
@@ -840,6 +847,7 @@ COMMON_CLK_PWM all=m
 COMMON_CLK_OXNAS all=n
 #- file drivers/clk/actions/Kconfig goes here
 #- file drivers/clk/analogbits/Kconfig goes here
+#- file drivers/clk/baikal-t1/Kconfig goes here
 #- file drivers/clk/bcm/Kconfig goes here
 #- file drivers/clk/hisilicon/Kconfig goes here
 #- file drivers/clk/imgtec/Kconfig goes here
@@ -859,6 +867,7 @@ COMMON_CLK_OXNAS all=n
 #- file drivers/clk/tegra/Kconfig goes here
 #- file drivers/clk/ti/Kconfig goes here
 #- file drivers/clk/uniphier/Kconfig goes here
+#- file drivers/clk/x86/Kconfig goes here
 #- file drivers/clk/zynqmp/Kconfig goes here
 
 #-
@@ -1163,6 +1172,7 @@ EXTCON_AXP288 all=m
 EXTCON_FSA9480 all=m
 EXTCON_GPIO all=m
 EXTCON_INTEL_INT3496 all=m
+EXTCON_INTEL_MRFLD all=m
 EXTCON_MAX14577 all=m
 EXTCON_MAX3355 all=m
 EXTCON_MAX77693 all=m
@@ -1197,12 +1207,13 @@ ISCSI_IBFT_FIND all=y
 ISCSI_IBFT all=m
 FW_CFG_SYSFS all=m
 FW_CFG_SYSFS_CMDLINE all=y
-#- file drivers/firmware/psci/Kconfig goes here
 #- file drivers/firmware/broadcom/Kconfig goes here
 #- file drivers/firmware/google/Kconfig goes here
 #- file drivers/firmware/efi/Kconfig goes here
 #- file drivers/firmware/imx/Kconfig goes here
 #- file drivers/firmware/meson/Kconfig goes here
+#- file drivers/firmware/psci/Kconfig goes here
+#- file drivers/firmware/smccc/Kconfig goes here
 #- file drivers/firmware/tegra/Kconfig goes here
 #- file drivers/firmware/xilinx/Kconfig goes here
 
@@ -1310,6 +1321,7 @@ GPIO_ADP5588 all=m
 GPIO_MAX7300 all=m
 GPIO_MAX732X all=m
 GPIO_PCA953X all=m
+GPIO_PCA953X_IRQ all=y
 GPIO_PCF857X all=m
 GPIO_TPIC2810 all=m
 GPIO_TS4900 all=m
@@ -1323,6 +1335,7 @@ GPIO_KEMPLD all=m
 GPIO_LP3943 all=m
 GPIO_LP873X all=m
 GPIO_MADERA all=m
+GPIO_MSIC all=y
 GPIO_STMPE all=y
 GPIO_TIMBERDALE all=y
 GPIO_TPS65086 all=m
@@ -1349,6 +1362,7 @@ GPIO_MC33880 all=m
 GPIO_PISOSR all=m
 GPIO_XRA1403 all=m
 GPIO_VIPERBOARD all=m
+GPIO_AGGREGATOR all=m
 GPIO_MOCKUP all=m
 
 #-
@@ -1378,7 +1392,6 @@ DRM_VKMS all=m
 #- file drivers/gpu/drm/udl/Kconfig goes here
 #- file drivers/gpu/drm/ast/Kconfig goes here
 #- file drivers/gpu/drm/mgag200/Kconfig goes here
-#- file drivers/gpu/drm/cirrus/Kconfig goes here
 #- file drivers/gpu/drm/armada/Kconfig goes here
 #- file drivers/gpu/drm/atmel-hlcdc/Kconfig goes here
 #- file drivers/gpu/drm/rcar-du/Kconfig goes here
@@ -1474,11 +1487,6 @@ DRM_I2C_ADV7511 all=m
 #-
 DRM_ANALOGIX_ANX78XX all=m
 
-#-
-#- *** FILE: drivers/gpu/drm/cirrus/Kconfig ***
-#-
-DRM_CIRRUS_QEMU all=m
-
 #-
 #- *** FILE: drivers/gpu/drm/etnaviv/Kconfig ***
 #-
@@ -1553,6 +1561,7 @@ DRM_RADEON_USERPTR all=y
 #-
 #- *** FILE: drivers/gpu/drm/tiny/Kconfig ***
 #-
+DRM_CIRRUS_QEMU all=m
 DRM_GM12U320 all=m
 TINYDRM_HX8357D all=m
 TINYDRM_ILI9225 all=m
@@ -1796,6 +1805,7 @@ SENSORS_AXI_FAN_CONTROL all=m
 SENSORS_K8TEMP all=m
 SENSORS_K10TEMP all=m
 SENSORS_FAM15H_POWER all=m
+SENSORS_AMD_ENERGY all=m
 SENSORS_APPLESMC all=m
 SENSORS_ARM_SCPI all=m
 SENSORS_ASB100 all=m
@@ -1959,6 +1969,7 @@ SENSORS_LTC2978 all=m
 SENSORS_LTC2978_REGULATOR all=y
 SENSORS_LTC3815 all=m
 SENSORS_MAX16064 all=m
+SENSORS_MAX16601 all=m
 SENSORS_MAX20730 all=m
 SENSORS_MAX20751 all=m
 SENSORS_MAX31785 all=m
@@ -2057,10 +2068,10 @@ I2C_HYDRA ppc=m
 I2C_POWERMAC ppc=m ppc64=m
 #- I2C system bus drivers (mostly embedded / system-on-chip)
 I2C_CBUS_GPIO all=m
-I2C_DESIGNWARE_PLATFORM all=m
 I2C_DESIGNWARE_SLAVE all=y
-I2C_DESIGNWARE_PCI all=m
+I2C_DESIGNWARE_PLATFORM all=m
 I2C_DESIGNWARE_BAYTRAIL all=y
+I2C_DESIGNWARE_PCI all=m
 I2C_EG20T all=m
 I2C_EMEV2 all=m
 I2C_GPIO all=m
@@ -2283,6 +2294,7 @@ AD7887 all=m
 AD7923 all=m
 AD7949 all=m
 AD799X all=m
+AD9467 all=m
 AXP20X_ADC all=m
 AXP288_ADC all=m
 CC10001_ADC all=m
@@ -2291,6 +2303,7 @@ DLN2_ADC all=m
 HI8435 all=m
 HX711 all=m
 INA2XX_ADC all=m
+INTEL_MRFLD_ADC all=m
 LTC2471 all=m
 LTC2485 all=m
 LTC2496 all=m
@@ -2298,12 +2311,14 @@ LTC2497 all=m
 MAX1027 all=m
 MAX11100 all=m
 MAX1118 all=m
+MAX1241 all=m
 MAX1363 all=m
 MAX9611 all=m
 MCP320X all=m
 MCP3422 all=m
 MCP3911 all=m
 MEN_Z188_ADC all=m
+MP2629_ADC all=m
 NAU7802 all=m
 QCOM_SPMI_IADC all=m
 QCOM_SPMI_VADC all=m
@@ -2340,6 +2355,7 @@ IIO_KFIFO_BUF all=m
 #- *** FILE: drivers/iio/chemical/Kconfig ***
 #-
 ATLAS_PH_SENSOR all=m
+ATLAS_EZO_SENSOR all=m
 BME680 all=m
 CCS811 all=m
 IAQCORE all=m
@@ -2452,6 +2468,7 @@ SI7020 all=m
 #-
 ADIS16400 all=m
 ADIS16460 all=m
+ADIS16475 all=m
 ADIS16480 all=m
 #- file drivers/iio/imu/bmi160/Kconfig goes here
 FXOS8700_I2C all=m
@@ -2615,8 +2632,10 @@ MB1232 all=m
 PING all=m
 RFD77402 all=m
 SRF04 all=m
+SX9310 all=m
 SX9500 all=m
 SRF08 all=m
+VCNL3020 all=m
 VL53L0X_I2C all=m
 
 #-
@@ -2680,6 +2699,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/ulp/srpt/Kconfig goes here
 #- file drivers/infiniband/ulp/iser/Kconfig goes here
 #- file drivers/infiniband/ulp/isert/Kconfig goes here
+#- file drivers/infiniband/ulp/rtrs/Kconfig goes here
 #- file drivers/infiniband/ulp/opa_vnic/Kconfig goes here
 
 #-
@@ -2788,6 +2808,12 @@ INFINIBAND_ISERT all=m
 #-
 INFINIBAND_OPA_VNIC all=m
 
+#-
+#- *** FILE: drivers/infiniband/ulp/rtrs/Kconfig ***
+#-
+INFINIBAND_RTRS_CLIENT all=m
+INFINIBAND_RTRS_SERVER all=m
+
 #-
 #- *** FILE: drivers/infiniband/ulp/srp/Kconfig ***
 #-
@@ -2930,14 +2956,12 @@ INPUT_AD714X_SPI all=m
 INPUT_ARIZONA_HAPTICS all=m
 INPUT_BMA150 all=m
 INPUT_E3X0_BUTTON all=m
-INPUT_MSM_VIBRATOR all=m
 INPUT_PCSPKR all=m
 INPUT_SPARCSPKR sparc64=m
 INPUT_MAX77693_HAPTIC all=m
 INPUT_MC13783_PWRBUTTON all=m
 INPUT_MMA8450 all=m
 INPUT_APANEL all=m
-INPUT_GP2A all=m
 INPUT_GPIO_BEEPER all=m
 INPUT_GPIO_DECODER all=m
 INPUT_GPIO_VIBRA all=m
@@ -2968,6 +2992,7 @@ INPUT_ADXL34X all=m
 INPUT_ADXL34X_I2C all=m
 INPUT_ADXL34X_SPI all=m
 INPUT_IMS_PCU all=m
+INPUT_IQS269A all=m
 INPUT_CMA3000 all=m
 INPUT_CMA3000_I2C all=m
 INPUT_XEN_KBDDEV_FRONTEND all=m
@@ -3072,6 +3097,7 @@ TOUCHSCREEN_AUO_PIXCIR all=m
 TOUCHSCREEN_BU21013 all=m
 TOUCHSCREEN_BU21029 all=m
 TOUCHSCREEN_CHIPONE_ICN8505 all=m
+TOUCHSCREEN_CY8CTMA140 all=m
 TOUCHSCREEN_CY8CTMG110 all=m
 TOUCHSCREEN_CYTTSP_CORE all=m
 TOUCHSCREEN_CYTTSP_I2C all=m
@@ -3162,7 +3188,8 @@ TOUCHSCREEN_IQS5XX all=m
 #-
 #- *** FILE: drivers/interconnect/Kconfig ***
 #-
-INTERCONNECT all=m
+INTERCONNECT all=y
+#- file drivers/interconnect/imx/Kconfig goes here
 #- file drivers/interconnect/qcom/Kconfig goes here
 
 #-
@@ -3295,6 +3322,7 @@ LEDS_NIC78BX all=m
 LEDS_TI_LMU_COMMON all=m
 LEDS_LM36274 all=m
 LEDS_TPS6105X all=m
+LEDS_SGM3140 all=m
 #- LED Triggers
 #- file drivers/leds/trigger/Kconfig goes here
 
@@ -3392,6 +3420,7 @@ DM_THIN_PROVISIONING all=m
 DM_CACHE all=m
 DM_CACHE_SMQ all=m
 DM_WRITECACHE all=m
+DM_EBS all=m
 DM_ERA all=m
 DM_CLONE all=m
 DM_MIRROR all=m
@@ -3401,6 +3430,7 @@ DM_ZERO all=m
 DM_MULTIPATH all=m
 DM_MULTIPATH_QL all=m
 DM_MULTIPATH_ST all=m
+DM_MULTIPATH_HST all=m
 DM_DELAY all=m
 DM_DUST all=m
 DM_UEVENT all=y
@@ -3419,39 +3449,38 @@ DM_ZONED all=m
 BCACHE all=m
 BCACHE_DEBUG all=n
 BCACHE_CLOSURES_DEBUG all=n
+BCACHE_ASYNC_REGISTRAION all=y
 
 #-
 #- *** FILE: drivers/media/Kconfig ***
 #-
 #- file drivers/media/rc/Kconfig goes here
+#- file drivers/media/cec/Kconfig goes here
 MEDIA_SUPPORT all=m
-#- Multimedia core support
+MEDIA_SUPPORT_FILTER all=y
+MEDIA_SUBDRV_AUTOSELECT all=y
 MEDIA_CAMERA_SUPPORT all=y
 MEDIA_ANALOG_TV_SUPPORT all=y
 MEDIA_DIGITAL_TV_SUPPORT all=y
 MEDIA_RADIO_SUPPORT all=y
 MEDIA_SDR_SUPPORT all=y
-MEDIA_CEC_SUPPORT all=y
-#- file drivers/media/cec/Kconfig goes here
-#- file drivers/media/mc/Kconfig goes here
+MEDIA_PLATFORM_SUPPORT all=y
+MEDIA_TEST_SUPPORT all=n
 VIDEO_DEV all=m
-VIDEO_V4L2_SUBDEV_API all=y
-#- file drivers/media/v4l2-core/Kconfig goes here
+MEDIA_CONTROLLER all=y
 DVB_CORE all=m
-DVB_MMAP all=y
-DVB_NET all=y
+#- file drivers/media/v4l2-core/Kconfig goes here
+#- file drivers/media/mc/Kconfig goes here
 #- file drivers/media/dvb-core/Kconfig goes here
-#- Media drivers
+#- Drivers filtered as selected at 'Filter media drivers'
 #- file drivers/media/usb/Kconfig goes here
 #- file drivers/media/pci/Kconfig goes here
+#- file drivers/media/radio/Kconfig goes here
+#- file drivers/media/common/Kconfig goes here
 #- file drivers/media/platform/Kconfig goes here
 #- file drivers/media/mmc/Kconfig goes here
-#- file drivers/media/radio/Kconfig goes here
-#- Supported FireWire (IEEE 1394) Adapters
+#- file drivers/media/test-drivers/Kconfig goes here
 #- file drivers/media/firewire/Kconfig goes here
-#- file drivers/media/common/Kconfig goes here
-#- Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
-MEDIA_SUBDRV_AUTOSELECT all=y
 MEDIA_ATTACH all=y
 #- file drivers/media/i2c/Kconfig goes here
 #- file drivers/media/spi/Kconfig goes here
@@ -3462,6 +3491,26 @@ MEDIA_ATTACH all=y
 #- *** FILE: drivers/media/cec/Kconfig ***
 #-
 MEDIA_CEC_RC all=y
+MEDIA_CEC_SUPPORT all=y
+#- file drivers/media/cec/platform/Kconfig goes here
+#- file drivers/media/cec/usb/Kconfig goes here
+
+#-
+#- *** FILE: drivers/media/cec/platform/Kconfig ***
+#-
+CEC_CROS_EC all=m
+CEC_SECO all=m
+CEC_SECO_RC all=y
+
+#-
+#- *** FILE: drivers/media/cec/usb/pulse8/Kconfig ***
+#-
+USB_PULSE8_CEC all=m
+
+#-
+#- *** FILE: drivers/media/cec/usb/rainshadow/Kconfig ***
+#-
+USB_RAINSHADOW_CEC all=m
 
 #-
 #- *** FILE: drivers/media/common/Kconfig ***
@@ -3504,6 +3553,8 @@ VIDEOBUF2_VMALLOC all=m
 #-
 #- *** FILE: drivers/media/dvb-core/Kconfig ***
 #-
+DVB_MMAP all=y
+DVB_NET all=y
 DVB_MAX_ADAPTERS all=8
 DVB_DYNAMIC_MINORS all=y
 DVB_DEMUX_SECTION_LOSS_LOG all=n
@@ -3512,7 +3563,7 @@ DVB_ULE_DEBUG all=n
 #-
 #- *** FILE: drivers/media/dvb-frontends/Kconfig ***
 #-
-#- DVB Frontend drivers hidden by 'Autoselect ancillary drivers'
+#- DVB Frontend drivers auto-selected by 'Autoselect ancillary drivers'
 #- Multistandard (satellite) frontends
 #- Multistandard (cable + terrestrial) frontends
 DVB_MN88472 all=m
@@ -3582,13 +3633,14 @@ DVB_SP2 all=m
 #-
 #- *** FILE: drivers/media/firewire/Kconfig ***
 #-
+#- FireWire (IEEE 1394) Adapters
 DVB_FIREDTV all=m
 
 #-
 #- *** FILE: drivers/media/i2c/Kconfig ***
 #-
-#- I2C drivers hidden by 'Autoselect ancillary drivers'
-#- Audio decoders, processors and mixers
+#- IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#- audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'
 VIDEO_TVAUDIO all=m
 VIDEO_TDA7432 all=m
 VIDEO_TDA9840 all=m
@@ -3599,9 +3651,7 @@ VIDEO_CS53L32A all=m
 VIDEO_WM8775 all=m
 VIDEO_WM8739 all=m
 VIDEO_VP27SMPX ia64=m
-#- RDS decoders
 VIDEO_SAA6588 all=m
-#- Video decoders
 VIDEO_BT819 all=m
 VIDEO_BT856 all=m
 VIDEO_KS0127 all=m
@@ -3611,47 +3661,97 @@ VIDEO_TVP5150 all=m
 VIDEO_VPX3220 all=m
 #- Video and audio decoders
 #- file drivers/media/i2c/cx25840/Kconfig goes here
-#- Video encoders
 VIDEO_SAA7127 all=m
 VIDEO_SAA7185 all=m
 VIDEO_ADV7170 all=m
 VIDEO_ADV7175 all=m
-#- Camera sensor devices
+VIDEO_UPD64031A all=m
+VIDEO_UPD64083 all=m
+VIDEO_HI556 all=m
+VIDEO_IMX214 all=m
+VIDEO_IMX219 all=m
+VIDEO_IMX258 all=m
+VIDEO_IMX274 all=m
+VIDEO_IMX290 all=m
+VIDEO_IMX319 all=m
+VIDEO_IMX355 all=m
+VIDEO_OV2640 all=m
+VIDEO_OV2659 all=m
+VIDEO_OV2680 all=m
+VIDEO_OV2685 all=m
+VIDEO_OV2740 all=m
+VIDEO_OV5647 all=m
+VIDEO_OV6650 all=m
+VIDEO_OV5670 all=m
+VIDEO_OV5675 all=m
+VIDEO_OV5695 all=m
+VIDEO_OV7251 all=m
+VIDEO_OV772X all=m
 VIDEO_OV7670 all=m
+VIDEO_OV7740 all=m
+VIDEO_OV8856 all=m
+VIDEO_OV9640 all=m
+VIDEO_OV9650 all=m
+VIDEO_OV13858 all=m
+VIDEO_VS6624 all=m
+VIDEO_MT9M001 all=m
+VIDEO_MT9M032 all=m
+VIDEO_MT9M111 all=m
+VIDEO_MT9P031 all=m
+VIDEO_MT9T001 all=m
+VIDEO_MT9T112 all=m
+VIDEO_MT9V032 all=m
+VIDEO_MT9V111 all=m
 VIDEO_SR030PC30 all=m
 VIDEO_NOON010PC30 all=m
 #- file drivers/media/i2c/m5mols/Kconfig goes here
+VIDEO_RJ54N1 all=m
+VIDEO_S5K6AA all=m
+VIDEO_S5K6A3 all=m
+VIDEO_S5K4ECGX all=m
+VIDEO_S5K5BAF all=m
 #- file drivers/media/i2c/smiapp/Kconfig goes here
 #- file drivers/media/i2c/et8ek8/Kconfig goes here
-#- Lens drivers
-#- Flash devices
-#- Video improvement chips
-VIDEO_UPD64031A all=m
-VIDEO_UPD64083 all=m
-#- Audio/Video compression chips
-#- SDR tuner chips
-#- Miscellaneous helper chips
+VIDEO_S5C73M3 all=m
+VIDEO_AD5820 all=m
+VIDEO_AK7375 all=m
+VIDEO_DW9714 all=m
+VIDEO_DW9807_VCM all=m
+VIDEO_ADP1653 all=m
+VIDEO_LM3560 all=m
+VIDEO_LM3646 all=m
 
 #-
 #- *** FILE: drivers/media/i2c/cx25840/Kconfig ***
 #-
 VIDEO_CX25840 all=m
 
+#-
+#- *** FILE: drivers/media/i2c/et8ek8/Kconfig ***
+#-
+VIDEO_ET8EK8 all=m
+
 #-
 #- *** FILE: drivers/media/i2c/m5mols/Kconfig ***
 #-
 VIDEO_M5MOLS all=m
 
+#-
+#- *** FILE: drivers/media/i2c/smiapp/Kconfig ***
+#-
+VIDEO_SMIAPP all=m
+
 #-
 #- *** FILE: drivers/media/mc/Kconfig ***
 #-
-MEDIA_CONTROLLER all=y
 MEDIA_CONTROLLER_DVB all=y
 MEDIA_CONTROLLER_REQUEST_API all=y
+#- Please notice that the enabled Media controller Request API is EXPERIMENTAL
 
 #-
 #- *** FILE: drivers/media/mmc/siano/Kconfig ***
 #-
+#- MMC/SDIO DVB adapters
 SMS_SDIO_DRV all=m
 
 #-
@@ -3691,6 +3791,7 @@ MEDIA_PCI_SUPPORT all=y
 #- file drivers/media/pci/smipcie/Kconfig goes here
 #- file drivers/media/pci/netup_unidvb/Kconfig goes here
 #- file drivers/media/pci/intel/ipu3/Kconfig goes here
+VIDEO_PCI_SKELETON all=m
 
 #-
 #- *** FILE: drivers/media/pci/b2c2/Kconfig ***
@@ -3879,18 +3980,9 @@ VIDEO_ASPEED all=m
 #- file drivers/media/platform/sunxi/Kconfig goes here
 V4L_MEM2MEM_DRIVERS all=y
 VIDEO_MEM2MEM_DEINTERLACE all=m
-VIDEO_SH_VEU all=m
 VIDEO_RENESAS_VSP1 all=m
-V4L_TEST_DRIVERS all=n
-#- file drivers/media/platform/vimc/Kconfig goes here
-#- file drivers/media/platform/vivid/Kconfig goes here
-#- file drivers/media/platform/vicodec/Kconfig goes here
 DVB_PLATFORM_DRIVERS all=y
 #- file drivers/media/platform/sti/c8sectpfe/Kconfig goes here
-CEC_PLATFORM_DRIVERS all=y
-VIDEO_CROS_EC_CEC all=m
-VIDEO_SECO_CEC all=m
-VIDEO_SECO_RC all=y
 SDR_PLATFORM_DRIVERS all=y
 
 #-
@@ -4029,13 +4121,21 @@ RC_MAP all=m
 #-
 #- *** FILE: drivers/media/spi/Kconfig ***
 #-
-#- SPI drivers hidden by 'Autoselect ancillary drivers'
+#- SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'
 CXD2880_SPI_DRV all=m
 
+#-
+#- *** FILE: drivers/media/test-drivers/Kconfig ***
+#-
+V4L_TEST_DRIVERS all=n
+#- file drivers/media/test-drivers/vimc/Kconfig goes here
+#- file drivers/media/test-drivers/vivid/Kconfig goes here
+#- file drivers/media/test-drivers/vicodec/Kconfig goes here
+
 #-
 #- *** FILE: drivers/media/tuners/Kconfig ***
 #-
-#- Tuner drivers hidden by 'Autoselect ancillary drivers'
+#- Tuner drivers auto-selected by 'Autoselect ancillary drivers'
 MEDIA_TUNER_TDA18212 all=m
 MEDIA_TUNER_M88RS6000T all=m
 
@@ -4075,9 +4175,6 @@ MEDIA_USB_SUPPORT all=y
 #- file drivers/media/usb/airspy/Kconfig goes here
 #- file drivers/media/usb/hackrf/Kconfig goes here
 #- file drivers/media/usb/msi2500/Kconfig goes here
-#- USB HDMI CEC adapters
-#- file drivers/media/usb/pulse8-cec/Kconfig goes here
-#- file drivers/media/usb/rainshadow-cec/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/usb/airspy/Kconfig ***
@@ -4265,11 +4362,6 @@ VIDEO_HDPVR all=m
 #-
 USB_MSI2500 all=m
 
-#-
-#- *** FILE: drivers/media/usb/pulse8-cec/Kconfig ***
-#-
-USB_PULSE8_CEC all=m
-
 #-
 #- *** FILE: drivers/media/usb/pvrusb2/Kconfig ***
 #-
@@ -4285,11 +4377,6 @@ USB_PWC all=m
 USB_PWC_DEBUG all=n
 USB_PWC_INPUT_EVDEV all=y
 
-#-
-#- *** FILE: drivers/media/usb/rainshadow-cec/Kconfig ***
-#-
-USB_RAINSHADOW_CEC all=m
-
 #-
 #- *** FILE: drivers/media/usb/s2255/Kconfig ***
 #-
@@ -4348,9 +4435,9 @@ USB_ZR364XX all=m
 #- *** FILE: drivers/media/v4l2-core/Kconfig ***
 #-
 VIDEO_V4L2 all=m
+VIDEO_V4L2_SUBDEV_API all=y
 VIDEO_ADV_DEBUG all=n
 VIDEO_FIXED_MINOR_RANGES all=n
-VIDEO_PCI_SKELETON all=m
 VIDEO_TUNER all=m sparc=
 V4L2_FLASH_LED_CLASS all=m
 
@@ -4428,14 +4515,18 @@ MFD_EXYNOS_LPASS all=m
 MFD_MC13XXX all=m
 MFD_MC13XXX_SPI all=m
 MFD_MC13XXX_I2C all=m
+MFD_MP2629 all=m
 HTC_PASIC3 all=m
 MFD_INTEL_QUARK_I2C_GPIO all=m
 LPC_ICH all=m
 LPC_SCH all=m
 INTEL_SOC_PMIC_BXTWC all=m
 INTEL_SOC_PMIC_CHTDC_TI all=m
+INTEL_SOC_PMIC_MRFLD all=m
 MFD_INTEL_LPSS_ACPI all=m
 MFD_INTEL_LPSS_PCI all=m
+MFD_INTEL_MSIC all=y
+MFD_INTEL_PMC_BXT all=m
 MFD_IQS62X all=m
 MFD_JANZ_CMODIO all=m
 MFD_KEMPLD all=m
@@ -4444,6 +4535,7 @@ MFD_88PM805 all=m
 MFD_MAX14577 all=m
 MFD_MAX77693 all=m
 MFD_MAX8907 all=m
+MFD_MT6360 all=m
 MFD_MT6397 all=m
 MFD_MENF21BMC all=m
 EZX_PCAP all=y
@@ -4722,6 +4814,7 @@ RFD_FTL all=m
 SSFDC all=m
 SM_FTL all=m
 MTD_OOPS all=m
+MTD_PSTORE all=m
 MTD_SWAP all=m
 MTD_PARTITIONED_MASTER all=y
 #- file drivers/mtd/chips/Kconfig goes here
@@ -4853,6 +4946,7 @@ MTD_NAND_MTK all=m
 MTD_NAND_MXIC all=m
 MTD_NAND_GPIO all=m
 MTD_NAND_PLATFORM all=m sparc=n
+MTD_NAND_ARASAN all=m
 #- Misc
 MTD_NAND_NANDSIM all=m ppc=n ppc64=n sparc=n
 MTD_NAND_RICOH all=m
@@ -5168,6 +5262,7 @@ NET_DSA_AR9331 all=m
 NET_DSA_SJA1105 all=m
 NET_DSA_SJA1105_PTP all=y
 NET_DSA_SJA1105_TAS all=y
+NET_DSA_SJA1105_VL all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/3com/Kconfig ***
@@ -5616,6 +5711,7 @@ MLX5_EN_ARFS all=y
 MLX5_EN_RXNFC all=y
 MLX5_MPFS all=y
 MLX5_ESWITCH all=y
+MLX5_CLS_ACT all=y
 MLX5_TC_CT all=y
 MLX5_CORE_EN_DCB all=y
 MLX5_CORE_IPOIB all=y
@@ -6018,6 +6114,7 @@ BCM63XX_PHY all=m
 BCM7XXX_PHY all=m
 BCM87XX_PHY all=m
 BROADCOM_PHY all=m
+BCM54140_PHY all=m
 BCM84881_PHY all=y
 CICADA_PHY all=m
 CORTINA_PHY all=m
@@ -6497,6 +6594,7 @@ MT7603E all=m
 #- *** FILE: drivers/net/wireless/mediatek/mt76/mt7615/Kconfig ***
 #-
 MT7615E all=m
+MT7663U all=m
 
 #-
 #- *** FILE: drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig ***
@@ -6510,6 +6608,11 @@ MT76x0E all=m
 MT76x2E all=m
 MT76x2U all=m
 
+#-
+#- *** FILE: drivers/net/wireless/mediatek/mt76/mt7915/Kconfig ***
+#-
+MT7915E all=m
+
 #-
 #- *** FILE: drivers/net/wireless/mediatek/mt7601u/Kconfig ***
 #-
@@ -6599,6 +6702,9 @@ RTL8192C_COMMON all=m
 RTW88 all=m
 RTW88_8822BE all=n
 RTW88_8822CE all=n
+RTW88_8723DE all=m
+RTW88_DEBUG all=n
+RTW88_DEBUGFS all=n
 
 #-
 #- *** FILE: drivers/net/wireless/rsi/Kconfig ***
@@ -7067,6 +7173,7 @@ PINCTRL_CEDARFORK all=m
 PINCTRL_DENVERTON all=m
 PINCTRL_GEMINILAKE all=m
 PINCTRL_ICELAKE all=m
+PINCTRL_JASPERLAKE all=m
 PINCTRL_LEWISBURG all=m
 PINCTRL_SUNRISEPOINT all=m
 PINCTRL_TIGERLAKE all=m
@@ -7124,6 +7231,7 @@ ACPI_WMI all=m
 WMI_BMOF all=m
 ALIENWARE_WMI all=m
 HUAWEI_WMI all=m
+INTEL_WMI_SBL_FW_UPDATE all=m
 INTEL_WMI_THUNDERBOLT all=m
 MXM_WMI all=m
 PEAQ_WMI all=m
@@ -7206,10 +7314,15 @@ INTEL_TURBO_MAX_3 all=y
 INTEL_UNCORE_FREQ_CONTROL all=m
 INTEL_BXTWC_PMIC_TMU all=m
 INTEL_CHTDC_TI_PWRBTN all=m
+INTEL_MFLD_THERMAL all=m
+INTEL_MID_POWER_BUTTON all=m
+INTEL_MRFLD_PWRBTN all=m
 INTEL_PMC_CORE all=y
-INTEL_PMC_IPC all=m
 INTEL_PUNIT_IPC all=m
 INTEL_SCU_IPC i386=y
+INTEL_SCU_PCI all=y
+INTEL_SCU_PLATFORM all=m
+INTEL_SCU_IPC_UTIL all=m
 INTEL_TELEMETRY all=m
 
 #-
@@ -7270,6 +7383,7 @@ WM831X_POWER all=m
 WM8350_POWER all=m
 TEST_POWER all=m
 CHARGER_ADP5061 all=m
+BATTERY_CW2015 all=m
 BATTERY_DS2760 all=m
 BATTERY_DS2780 all=m
 BATTERY_DS2781 all=m
@@ -7303,6 +7417,7 @@ CHARGER_MANAGER all=y
 CHARGER_LT3651 all=m
 CHARGER_MAX14577 all=m
 CHARGER_MAX77693 all=m
+CHARGER_MP2629 all=m
 CHARGER_BQ2415X all=m
 CHARGER_BQ24190 all=m
 CHARGER_BQ24257 all=m
@@ -7316,6 +7431,7 @@ BATTERY_GOLDFISH all=m
 BATTERY_RT5033 all=m
 CHARGER_RT9455 all=m
 CHARGER_CROS_USBPD all=m
+CHARGER_BD99954 all=m
 CHARGER_WILCO all=m
 
 #-
@@ -7359,6 +7475,7 @@ PTP_1588_CLOCK_VMW all=m
 PWM all=y
 PWM_DEBUG all=n
 PWM_CROS_EC all=m
+PWM_IQS620A all=m
 PWM_LP3943 all=m
 PWM_LPSS all=m
 PWM_LPSS_PCI all=m
@@ -7437,11 +7554,13 @@ REGULATOR_MAX8907 all=m
 REGULATOR_MAX8952 all=m
 REGULATOR_MAX8973 all=m
 REGULATOR_MAX77693 all=m
+REGULATOR_MAX77826 all=m
 REGULATOR_MC13783 all=m
 REGULATOR_MC13892 all=m
 REGULATOR_MP8859 all=m
 REGULATOR_MT6311 all=m
 REGULATOR_MT6323 all=m
+REGULATOR_MT6358 all=m
 REGULATOR_MT6397 all=m
 REGULATOR_PCAP all=m
 REGULATOR_PCF50633 all=m
@@ -7956,8 +8075,8 @@ SPI_BITBANG all=m
 SPI_BUTTERFLY all=m
 SPI_CADENCE all=m
 SPI_DESIGNWARE all=y
+SPI_DW_DMA all=y
 SPI_DW_PCI all=m
-SPI_DW_MID_DMA all=y
 SPI_DW_MMIO all=m
 SPI_DLN2 all=m
 SPI_NXP_FLEXSPI all=m
@@ -7975,6 +8094,7 @@ SPI_TOPCLIFF_PCH all=m
 SPI_XCOMM all=m
 SPI_XILINX all=m
 SPI_ZYNQMP_GQSPI all=m
+SPI_AMD all=m
 #- SPI Multiplexer support
 SPI_MUX all=m
 #- SPI Protocol Masters
@@ -8343,18 +8463,46 @@ KS7010 all=m
 #-
 STAGING_MEDIA all=y
 #- file drivers/staging/media/allegro-dvt/Kconfig goes here
+#- file drivers/staging/media/atomisp/Kconfig goes here
 #- file drivers/staging/media/hantro/Kconfig goes here
 #- file drivers/staging/media/imx/Kconfig goes here
 #- file drivers/staging/media/meson/vdec/Kconfig goes here
 #- file drivers/staging/media/omap4iss/Kconfig goes here
+#- file drivers/staging/media/rkvdec/Kconfig goes here
 #- file drivers/staging/media/sunxi/Kconfig goes here
 #- file drivers/staging/media/tegra-vde/Kconfig goes here
+#- file drivers/staging/media/tegra-video/Kconfig goes here
 #- file drivers/staging/media/ipu3/Kconfig goes here
 #- file drivers/staging/media/soc_camera/Kconfig goes here
 #- file drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig goes here
 #- file drivers/staging/media/rkisp1/Kconfig goes here
 #- file drivers/staging/media/usbvision/Kconfig goes here
 
+#-
+#- *** FILE: drivers/staging/media/atomisp/Kconfig ***
+#-
+INTEL_ATOMISP all=y
+VIDEO_ATOMISP all=m
+VIDEO_ATOMISP_ISP2401 all=y
+#- file drivers/staging/media/atomisp/i2c/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/media/atomisp/i2c/Kconfig ***
+#-
+#- file drivers/staging/media/atomisp/i2c/ov5693/Kconfig goes here
+VIDEO_ATOMISP_OV2722 all=m
+VIDEO_ATOMISP_GC2235 all=m
+VIDEO_ATOMISP_MSRLIST_HELPER all=m
+VIDEO_ATOMISP_MT9M114 all=m
+VIDEO_ATOMISP_GC0310 all=m
+VIDEO_ATOMISP_OV2680 all=m
+VIDEO_ATOMISP_LM3554 all=m
+
+#-
+#- *** FILE: drivers/staging/media/atomisp/i2c/ov5693/Kconfig ***
+#-
+VIDEO_ATOMISP_OV5693 all=m
+
 #-
 #- *** FILE: drivers/staging/media/ipu3/Kconfig ***
 #-
@@ -8765,6 +8913,7 @@ HAS_TXX9_SERIAL ppc64=y
 SERIAL_TXX9_NR_UARTS ppc64=6
 SERIAL_TXX9_CONSOLE ppc64=n
 SERIAL_JSM all=m sparc=n
+SERIAL_LANTIQ all=m
 SERIAL_SCCNXP all=m
 SERIAL_SC16IS7XX all=m
 SERIAL_SC16IS7XX_I2C all=y
@@ -9027,6 +9176,7 @@ USB_BDC_PCI all=m
 USB_C67X00_HCD all=m
 USB_XHCI_HCD all=m
 USB_XHCI_DBGCAP all=n
+USB_XHCI_PCI_RENESAS all=m
 USB_EHCI_HCD all=m
 USB_EHCI_ROOT_HUB_TT all=y sparc64=n
 USB_EHCI_TT_NEWSCHED all=y
@@ -9556,6 +9706,7 @@ VIRTIO_PCI_LEGACY all=y
 VIRTIO_VDPA all=m
 VIRTIO_PMEM all=m
 VIRTIO_BALLOON all=m
+VIRTIO_MEM all=m
 VIRTIO_INPUT all=m
 VIRTIO_MMIO all=m
 VIRTIO_MMIO_CMDLINE_DEVICES all=y
@@ -9827,7 +9978,6 @@ MISC_FILESYSTEMS all=y
 #- file fs/ufs/Kconfig goes here
 #- file fs/erofs/Kconfig goes here
 #- file fs/vboxsf/Kconfig goes here
-#- file fs/aufs/Kconfig goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
@@ -9875,12 +10025,6 @@ AFS_DEBUG all=n
 AFS_FSCACHE all=y
 AFS_DEBUG_CURSOR all=n
 
-#-
-#- *** FILE: fs/aufs/Kconfig ***
-#-
-AUFS_FHSM all=y
-AUFS_DIRREN all=y
-
 #-
 #- *** FILE: fs/autofs/Kconfig ***
 #-
@@ -10037,6 +10181,7 @@ F2FS_FS_COMPRESSION all=y
 F2FS_FS_LZO all=y
 F2FS_FS_LZ4 all=y
 F2FS_FS_ZSTD all=y
+F2FS_FS_LZORLE all=y
 
 #-
 #- *** FILE: fs/fat/Kconfig ***
@@ -10308,6 +10453,12 @@ PSTORE_CONSOLE all=y
 PSTORE_PMSG all=y
 PSTORE_FTRACE all=n
 PSTORE_RAM all=m
+PSTORE_BLK all=m
+PSTORE_BLK_BLKDEV all=""
+PSTORE_BLK_KMSG_SIZE all=64
+PSTORE_BLK_MAX_REASON all=2
+PSTORE_BLK_PMSG_SIZE all=64
+PSTORE_BLK_CONSOLE_SIZE all=64
 
 #-
 #- *** FILE: fs/qnx4/Kconfig ***
@@ -10454,11 +10605,13 @@ KERNEL_LZMA all=n
 KERNEL_XZ all=y
 KERNEL_LZO all=n
 KERNEL_LZ4 all=n
+DEFAULT_INIT all=""
 DEFAULT_HOSTNAME all="(none)"
 SWAP all=y
 SYSVIPC all=y
 SYSVIPC_SYSCTL all=y
 POSIX_MQUEUE all=y
+WATCH_QUEUE all=y
 CROSS_MEMORY_ATTACH all=y
 USELIB all=y
 AUDIT all=y
@@ -10493,7 +10646,6 @@ CGROUPS all=y
 PAGE_COUNTER all=y
 MEMCG all=y
 MEMCG_SWAP all=y
-MEMCG_SWAP_ENABLED all=y
 BLK_CGROUP all=y
 CGROUP_SCHED all=y
 FAIR_GROUP_SCHED all=y
@@ -10649,6 +10801,7 @@ SUSPEND all=y
 SUSPEND_FREEZER ppc=y ppc64=y
 HIBERNATE_CALLBACKS all=y
 HIBERNATION all=y
+HIBERNATION_SNAPSHOT_DEV all=y
 PM_STD_PARTITION all=""
 PM_SLEEP all=y
 PM_SLEEP_SMP all=y
@@ -10705,7 +10858,6 @@ FUNCTION_GRAPH_TRACER all=y
 DYNAMIC_FTRACE all=y
 FUNCTION_PROFILER all=y
 STACK_TRACER all=y
-PREEMPTIRQ_EVENTS all=n
 IRQSOFF_TRACER all=n
 SCHED_TRACER all=y
 HWLAT_TRACER all=n
@@ -10724,6 +10876,7 @@ KPROBE_EVENTS_ON_NOTRACE all=n
 UPROBE_EVENTS all=y
 BPF_KPROBE_OVERRIDE all=y
 FTRACE_MCOUNT_RECORD all=y
+SYNTH_EVENTS all=y
 HIST_TRIGGERS all=n
 TRACE_EVENT_INJECT all=n
 TRACEPOINT_BENCHMARK all=n
@@ -10732,6 +10885,7 @@ TRACE_EVAL_MAP_FILE all=n
 FTRACE_STARTUP_TEST all=n
 RING_BUFFER_STARTUP_TEST all=n
 PREEMPTIRQ_DELAY_TEST all=m
+SYNTH_EVENT_GEN_TEST all=m
 KPROBE_EVENT_GEN_TEST all=m
 
 #-
@@ -10789,10 +10943,12 @@ CONSOLE_LOGLEVEL_QUIET all=4
 MESSAGE_LOGLEVEL_DEFAULT all=4
 BOOT_PRINTK_DELAY all=y
 DYNAMIC_DEBUG all=n
+DYNAMIC_DEBUG_CORE all=n
 SYMBOLIC_ERRNAME all=y
 DEBUG_BUGVERBOSE all=y
 DEBUG_INFO all=y
 DEBUG_INFO_REDUCED all=n
+DEBUG_INFO_COMPRESSED all=y
 DEBUG_INFO_SPLIT all=y
 DEBUG_INFO_DWARF4 all=y
 DEBUG_INFO_BTF all=n
@@ -10825,6 +10981,7 @@ SLUB_STATS all=n
 DEBUG_KMEMLEAK all=n
 SCHED_STACK_END_CHECK all=y
 DEBUG_VM all=n
+DEBUG_VM_PGTABLE all=n
 DEBUG_VIRTUAL all=n
 MEMORY_NOTIFIER_ERROR_INJECT all=m
 DEBUG_HIGHMEM i386=n sparc=n
@@ -10875,6 +11032,7 @@ LATENCYTOP all=n
 #- file kernel/trace/Kconfig goes here
 PROVIDE_OHCI1394_DMA_INIT all=n
 #- file samples/Kconfig goes here
+#- file lib/Kconfig.kcsan goes here
 #- file arch/$(SRCARCH)/Kconfig.debug goes here
 #- file lib/kunit/Kconfig goes here
 NOTIFIER_ERROR_INJECTION all=m
@@ -10911,6 +11069,7 @@ TEST_HASH all=m
 TEST_IDA all=m
 TEST_PARMAN all=m
 TEST_LKM all=m
+TEST_BITOPS all=m
 TEST_VMALLOC all=m
 TEST_USER_COPY all=n
 TEST_BPF all=n
@@ -10927,6 +11086,7 @@ TEST_MEMCAT_P all=m
 TEST_OBJAGG all=m
 TEST_STACKINIT all=m
 TEST_MEMINIT all=m
+TEST_HMM all=m
 HYPERV_TESTING all=y
 
 #-
@@ -10988,6 +11148,7 @@ KUNIT_EXAMPLE_TEST all=n
 #- *** FILE: lib/math/Kconfig ***
 #-
 CORDIC all=m
+PRIME_NUMBERS all=m
 
 #-
 #- *** FILE: lib/xz/Kconfig ***
@@ -11043,7 +11204,7 @@ ZSWAP_DEFAULT_ON all=y
 ZBUD all=m
 Z3FOLD all=m
 ZSMALLOC all=y
-PGTABLE_MAPPING all=n
+ZSMALLOC_PGTABLE_MAPPING all=n
 ZSMALLOC_STAT all=y
 DEFERRED_STRUCT_PAGE_INIT all=n
 IDLE_PAGE_TRACKING all=y
@@ -11063,6 +11224,7 @@ PAGE_OWNER all=n
 PAGE_POISONING all=n
 DEBUG_PAGE_REF all=n
 DEBUG_RODATA_TEST all=n
+DEBUG_WX all=y
 PTDUMP_DEBUGFS all=n
 
 #-
@@ -11240,8 +11402,10 @@ BT_HS all=y
 BT_LE all=y
 BT_6LOWPAN all=m
 BT_LEDS all=y
-BT_SELFTEST all=n
+BT_MSFTEXT all=y
 BT_DEBUGFS all=n
+BT_SELFTEST all=n
+BT_FEATURE_DEBUG all=n
 #- file drivers/bluetooth/Kconfig goes here
 
 #-
@@ -11279,6 +11443,7 @@ BPFILTER_UMH all=m
 BRIDGE all=m
 BRIDGE_IGMP_SNOOPING all=y
 BRIDGE_VLAN_FILTERING all=y
+BRIDGE_MRP all=y
 
 #-
 #- *** FILE: net/bridge/netfilter/Kconfig ***
@@ -11521,6 +11686,7 @@ IPV6_OPTIMISTIC_DAD all=y
 INET6_AH all=m
 INET6_ESP all=m
 INET6_ESP_OFFLOAD all=m
+INET6_ESPINTCP all=y
 INET6_IPCOMP all=m
 IPV6_MIP6 all=y
 IPV6_ILA all=m
@@ -11908,6 +12074,14 @@ PHONET all=m
 #-
 PSAMPLE all=m
 
+#-
+#- *** FILE: net/qrtr/Kconfig ***
+#-
+QRTR all=m
+QRTR_SMD all=m
+QRTR_TUN all=m
+QRTR_MHI all=m
+
 #-
 #- *** FILE: net/rds/Kconfig ***
 #-
@@ -12022,6 +12196,7 @@ NET_ACT_SKBMOD all=m
 NET_ACT_IFE all=m
 NET_ACT_TUNNEL_KEY all=m
 NET_ACT_CT all=m
+NET_ACT_GATE all=m
 NET_IFE_SKBMARK all=m
 NET_IFE_SKBPRIO all=m
 NET_IFE_SKBTCINDEX all=m
@@ -12242,6 +12417,7 @@ BIG_KEYS all=y
 TRUSTED_KEYS all=m
 ENCRYPTED_KEYS all=y
 KEY_DH_OPERATIONS all=y
+KEY_NOTIFICATIONS all=y
 
 #-
 #- *** FILE: security/loadpin/Kconfig ***
@@ -12650,6 +12826,8 @@ SND_SOC_AMD_CZ_DA7219MX98357_MACH all=m
 SND_SOC_AMD_CZ_RT5645_MACH all=m
 SND_SOC_AMD_ACP3x all=m
 SND_SOC_AMD_RV_RT5682_MACH all=m
+SND_SOC_AMD_RENOIR all=m
+SND_SOC_AMD_RENOIR_MACH all=m
 
 #-
 #- *** FILE: sound/soc/atmel/Kconfig ***
@@ -12720,6 +12898,7 @@ SND_SOC_MAX98504 all=m
 SND_SOC_MAX9867 all=m
 SND_SOC_MAX98927 all=m
 SND_SOC_MAX98373 all=m
+SND_SOC_MAX98390 all=m
 SND_SOC_MAX9850 all=m
 SND_SOC_MAX9860 all=m
 SND_SOC_MSM8916_WCD_ANALOG all=m
@@ -12809,6 +12988,7 @@ SND_SOC_WM8978 all=m
 SND_SOC_WM8985 all=m
 SND_SOC_WM8991 all=m
 SND_SOC_WSA881X all=m
+SND_SOC_ZL38060 all=m
 SND_SOC_ZX_AUD96P22 all=m
 SND_SOC_LM4857 all=m
 SND_SOC_MAX9759 all=m
@@ -12839,6 +13019,7 @@ SND_SOC_FSL_SSI all=m
 SND_SOC_FSL_SPDIF all=m
 SND_SOC_FSL_ESAI all=m
 SND_SOC_FSL_MICFIL all=m
+SND_SOC_FSL_EASRC all=m
 SND_SOC_IMX_AUDMUX all=m
 #- SoC Audio support for Freescale PPC boards:
 SND_SOC_MPC5200_I2S all=m
@@ -12911,6 +13092,7 @@ SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH all=m
 SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH all=m
 SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH all=m
 SND_SOC_INTEL_BXT_RT298_MACH all=m
+SND_SOC_INTEL_SOF_WM8804_MACH all=m
 SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH all=m
 SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH all=m
 SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH all=m
@@ -12924,6 +13106,7 @@ SND_SOC_INTEL_SOF_PCM512x_MACH all=m
 SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH all=m
 SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH all=m
 SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH all=m
+SND_SOC_INTEL_EHL_RT5660_MACH all=m
 
 #-
 #- *** FILE: sound/soc/mediatek/Kconfig ***
@@ -12962,7 +13145,6 @@ SND_SOC_SOF_CANNONLAKE_SUPPORT all=y
 SND_SOC_SOF_COFFEELAKE_SUPPORT all=y
 SND_SOC_SOF_ICELAKE_SUPPORT all=y
 SND_SOC_SOF_COMETLAKE_LP_SUPPORT all=y
-SND_SOC_SOF_COMETLAKE_H_SUPPORT all=y
 SND_SOC_SOF_TIGERLAKE_SUPPORT all=y
 SND_SOC_SOF_ELKHARTLAKE_SUPPORT all=y
 SND_SOC_SOF_JASPERLAKE_SUPPORT all=y
@@ -13060,6 +13242,8 @@ AD7152 all=m
 AGP_SGI_TIOCA ia64=m
 ANON_INODES all=y
 ASIX_PHY all=m
+AUFS_DIRREN all=y
+AUFS_FHSM all=y
 BACKLIGHT_LCD_SUPPORT all=y
 BACKLIGHT_PM8941_WLED all=m
 BLK_DEV_SGIIOC4 ia64=m
@@ -13068,6 +13252,7 @@ BLK_WBT_SQ all=y
 BT_WILINK all=m
 CAPI_AVM all=y
 CAPI_EICON all=y
+CEC_PLATFORM_DRIVERS all=y
 CFQ_GROUP_IOSCHED all=y
 CHARGER_LTC3651 all=m
 CHASH_SELFTEST all=n
@@ -13152,7 +13337,10 @@ INET_XFRM_MODE_TUNNEL all=m
 INFINIBAND_CXGB3 all=m sparc=
 INFINIBAND_NES all=m sparc=
 INFINIBAND_NES_DEBUG all=n
+INPUT_GP2A all=m
 INPUT_KXTJ9_POLLED_MODE all=y
+INPUT_MSM_VIBRATOR all=m
+INTEL_PMC_IPC all=m
 INTEL_RDT all=y
 IOSCHED_CFQ all=y
 IOSCHED_DEADLINE all=y
@@ -13191,9 +13379,11 @@ IWLWIFI_PCIE_RTPM all=y
 JS_RTC sparc=n
 KERNEL_HEADER_TEST all=n
 KEXEC_VERIFY_SIG all=n
+KVM_DEBUG_FS all=n
 LBDAF i386=y ppc=y sparc=y sparc64=
 LCD_OTM3225A all=m
 MAY_USE_DEVLINK all=m
+MEMCG_SWAP_ENABLED all=y
 MFD_CROS_EC_CHARDEV all=m
 MICROCHIP_KSZ all=m
 MICROCHIP_KSZ_SPI_DRIVER all=m
@@ -13226,6 +13416,8 @@ NF_NAT_IPV6 all=m
 NF_TABLES_SET all=m
 NR_QUICK sparc64=1
 PCIEASPM_DEBUG all=n
+PGTABLE_MAPPING all=n
+PREEMPTIRQ_EVENTS all=n
 PSW_PHY_SEL all=n
 QTNFMAC_PEARL_PCIE all=m
 R8822BE all=m
@@ -13249,6 +13441,7 @@ SGI_MBCS ia64=m
 SGI_SNSC ia64=y
 SGI_TIOCX ia64=y
 SND_HDA_INTEL_DETECT_DMIC all=y
+SND_SOC_SOF_COMETLAKE_H_SUPPORT all=y
 SND_SOC_SOF_HDA_COMMON_HDMI_CODEC all=y
 SOC_CAMERA_MT9M001 all=m
 SOC_CAMERA_MT9T112 all=m
@@ -13257,6 +13450,7 @@ SOC_CAMERA_OV9640 all=m
 SOC_CAMERA_PLATFORM all=m
 SOC_CAMERA_RJ54N1 all=m
 SOC_CAMERA_TW9910 all=m
+SPI_DW_MID_DMA all=y
 SPI_MTK_QUADSPI all=m
 STAGING_EXFAT_DEBUG_MSG all=n
 STAGING_EXFAT_DEFAULT_CODEPAGE all=437
@@ -13281,7 +13475,11 @@ USB_WUSB_CBAF_DEBUG all=n
 UWB all=m
 UWB_I1480U all=m
 UWB_WHCI sparc=m
+VIDEO_CROS_EC_CEC all=m
+VIDEO_SECO_CEC all=m
+VIDEO_SECO_RC all=y
 VIDEO_SH_MOBILE_CEU all=m
+VIDEO_SH_VEU all=m
 VIDEO_ZORAN all=m ppc=n sparc=n
 VIDEO_ZORAN_AVS6EYES all=m
 VIDEO_ZORAN_BUZ all=m
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list