Up to 5.18.0.

diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index a037e6c98dbe8c1d4001bdedb52460b014bdbf74..72c144ebaba9c207860b907d76a875683d21bfab 100644 (file)
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
 aufs5.x-rcN kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig

-index 6c7dc1387beb0..4af0a823e5f24 100644
+index 30b751c7f11a..fb8214374858 100644

 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 @@ -312,6 +312,7 @@ source "fs/sysv/Kconfig"
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 @@ -312,6 +312,7 @@ source "fs/sysv/Kconfig"


@@ -14,7 +14,7 @@ index 6c7dc1387beb0..4af0a823e5f24 100644
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile

-index 208a74e0b00e1..57d47a0762e0a 100644
+index 208a74e0b00e..57d47a0762e0 100644

 --- a/fs/Makefile
 +++ b/fs/Makefile
 @@ -140,3 +140,4 @@ obj-$(CONFIG_EFIVAR_FS)            += efivarfs/
 --- a/fs/Makefile
 +++ b/fs/Makefile
 @@ -140,3 +140,4 @@ obj-$(CONFIG_EFIVAR_FS)            += efivarfs/


@@ -26,10 +26,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 aufs5.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS

-index 05fd080b82f3a..9554f31190578 100644
+index 61d9f114c37f..95cb37e9c555 100644

 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -3235,6 +3235,19 @@ F:      include/uapi/linux/audit.h
+@@ -3323,6 +3323,19 @@ F:      include/uapi/linux/audit.h

  F:    kernel/audit*
  F:    lib/*audit.c
  
  F:    kernel/audit*
  F:    lib/*audit.c
  


@@ -50,10 +50,10 @@ index 05fd080b82f3a..9554f31190578 100644
  M:    Miguel Ojeda <ojeda@kernel.org>
  S:    Maintained
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
  M:    Miguel Ojeda <ojeda@kernel.org>
  S:    Maintained
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c

-index 19fe19eaa50e9..9009a0efc4b28 100644
+index a58595f5ee2c..ba35d0d6847a 100644

 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c

-@@ -636,6 +636,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -635,6 +635,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,

        return error;
  }
  
        return error;
  }
  


@@ -79,7 +79,7 @@ index 19fe19eaa50e9..9009a0efc4b28 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c

-index c84269c6e8bf6..6f4f48c828351 100644
+index 93f4f5ee07bf..cddcf2e44930 100644

 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1345,7 +1345,7 @@ enum d_walk_ret {
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1345,7 +1345,7 @@ enum d_walk_ret {


@@ -92,7 +92,7 @@ index c84269c6e8bf6..6f4f48c828351 100644
  {
        struct dentry *this_parent;
 diff --git a/fs/fcntl.c b/fs/fcntl.c
  {
        struct dentry *this_parent;
 diff --git a/fs/fcntl.c b/fs/fcntl.c

-index 9c6c6a3e2de51..02382fa9bd341 100644
+index f15d885b9796..d91d1bf393cc 100644

 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -33,7 +33,7 @@
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -33,7 +33,7 @@


@@ -114,10 +114,10 @@ index 9c6c6a3e2de51..02382fa9bd341 100644
                return error;
  
 diff --git a/fs/namespace.c b/fs/namespace.c
                return error;
  
 diff --git a/fs/namespace.c b/fs/namespace.c

-index de6fae84f1a1a..e189393b34b14 100644
+index a0a36bfa3aa0..7a54c6b514a2 100644

 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 --- a/fs/namespace.c
 +++ b/fs/namespace.c

-@@ -839,6 +839,12 @@ static inline int check_mnt(struct mount *mnt)
+@@ -852,6 +852,12 @@ static inline int check_mnt(struct mount *mnt)

        return mnt->mnt_ns == current->nsproxy->mnt_ns;
  }
  
        return mnt->mnt_ns == current->nsproxy->mnt_ns;
  }
  


@@ -131,7 +131,7 @@ index de6fae84f1a1a..e189393b34b14 100644
   * vfsmount lock must be held for write
   */
 diff --git a/fs/splice.c b/fs/splice.c
   * vfsmount lock must be held for write
   */
 diff --git a/fs/splice.c b/fs/splice.c

-index 5dbce4dcc1a7d..3e6ba363b7775 100644
+index 047b79db8eb5..a21caa5c54c8 100644

 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -759,8 +759,8 @@ static int warn_unsupported(struct file *file, const char *op)
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -759,8 +759,8 @@ static int warn_unsupported(struct file *file, const char *op)


@@ -159,10 +159,10 @@ index 5dbce4dcc1a7d..3e6ba363b7775 100644
        unsigned int p_space;
        int ret;
 diff --git a/include/linux/fs.h b/include/linux/fs.h
        unsigned int p_space;
        int ret;
 diff --git a/include/linux/fs.h b/include/linux/fs.h

-index e2d892b201b07..5479e6dc18a23 100644
+index bbde95387a23..06c9242932a2 100644

 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h

-@@ -1372,6 +1372,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1347,6 +1347,7 @@ extern void fasync_free(struct fasync_struct *);

  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  
  /* can be called from interrupts */
  extern void kill_fasync(struct fasync_struct **, int, int);
  


@@ -170,7 +170,7 @@ index e2d892b201b07..5479e6dc18a23 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);
  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);

-@@ -2003,6 +2004,7 @@ struct file_operations {
+@@ -1979,6 +1980,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);
        ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
        unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
        int (*check_flags)(int);


@@ -178,7 +178,7 @@ index e2d892b201b07..5479e6dc18a23 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);
        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);

-@@ -2529,6 +2531,7 @@ extern int current_umask(void);
+@@ -2486,6 +2488,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);
  extern void ihold(struct inode * inode);
  extern void iput(struct inode *);
  extern int generic_update_time(struct inode *, struct timespec64 *, int);


@@ -186,7 +186,7 @@ index e2d892b201b07..5479e6dc18a23 100644
  
  /* /sys/fs */
  extern struct kobject *fs_kobj;
  
  /* /sys/fs */
  extern struct kobject *fs_kobj;

-@@ -2707,6 +2710,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2664,6 +2667,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)

  }
  
  void emergency_thaw_all(void);
  }
  
  void emergency_thaw_all(void);


@@ -195,7 +195,7 @@ index e2d892b201b07..5479e6dc18a23 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
  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 467b94257105e..dab20282c82e2 100644
+index 467b94257105..dab20282c82e 100644

 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
 @@ -248,6 +248,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
 --- a/include/linux/lockdep.h
 +++ b/include/linux/lockdep.h
 @@ -248,6 +248,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,


@@ -208,7 +208,7 @@ index 467b94257105e..dab20282c82e2 100644
   * Acquire a lock.
   *
 diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
   * Acquire a lock.
   *
 diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h

-index 8f882f5881e87..6b9808f098435 100644
+index 8f882f5881e8..6b9808f09843 100644

 --- a/include/linux/mnt_namespace.h
 +++ b/include/linux/mnt_namespace.h
 @@ -7,12 +7,15 @@ struct mnt_namespace;
 --- a/include/linux/mnt_namespace.h
 +++ b/include/linux/mnt_namespace.h
 @@ -7,12 +7,15 @@ struct mnt_namespace;


@@ -228,7 +228,7 @@ index 8f882f5881e87..6b9808f098435 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
  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 a55179fd60fc3..8e21c53cf8831 100644
+index a55179fd60fc..8e21c53cf883 100644

 --- a/include/linux/splice.h
 +++ b/include/linux/splice.h
 @@ -93,4 +93,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
 --- a/include/linux/splice.h
 +++ b/include/linux/splice.h
 @@ -93,4 +93,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);


@@ -243,10 +243,10 @@ index a55179fd60fc3..8e21c53cf8831 100644
 +                       unsigned int flags);
  #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
 +                       unsigned int flags);
  #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c

-index f8a0212189cad..43e3d1fdd570b 100644
+index c06cab6546ed..9d7c317899e1 100644

 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c

-@@ -189,7 +189,7 @@ static
+@@ -187,7 +187,7 @@ unsigned long max_lock_class_idx;

  struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
  DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
  
  struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
  DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
  


@@ -255,7 +255,7 @@ index f8a0212189cad..43e3d1fdd570b 100644
  {
        unsigned int class_idx = hlock->class_idx;
  
  {
        unsigned int class_idx = hlock->class_idx;
  

-@@ -210,6 +210,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
+@@ -208,6 +208,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)

         */
        return lock_classes + class_idx;
  }
         */
        return lock_classes + class_idx;
  }


@@ -267,10 +267,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
 aufs5.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c

-index d654ce7150fdd..422713de90f60 100644
+index c1031843cc6a..6597f53969bf 100644

 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c

-@@ -2191,7 +2191,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2190,7 +2190,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) {
        rc = -ENOENT;
        vma = find_exact_vma(mm, vm_start, vm_end);
        if (vma && vma->vm_file) {


@@ -280,7 +280,7 @@ index d654ce7150fdd..422713de90f60 100644
                rc = 0;
        }
 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
                rc = 0;
        }
 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c

-index 13452b32e2bd5..38acccfef9d49 100644
+index 13452b32e2bd..38acccfef9d4 100644

 --- a/fs/proc/nommu.c
 +++ b/fs/proc/nommu.c
 @@ -40,7 +40,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
 --- a/fs/proc/nommu.c
 +++ b/fs/proc/nommu.c
 @@ -40,7 +40,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)


@@ -296,7 +296,7 @@ index 13452b32e2bd5..38acccfef9d49 100644
                ino = inode->i_ino;
        }
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
                ino = inode->i_ino;
        }
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c

-index f46060eb91b5c..2a7c8709acadd 100644
+index f46060eb91b5..2a7c8709acad 100644

 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -281,7 +281,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -281,7 +281,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)


@@ -321,7 +321,7 @@ index f46060eb91b5c..2a7c8709acadd 100644
        struct mempolicy *pol;
        char buffer[64];
 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
        struct mempolicy *pol;
        char buffer[64];
 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c

-index a6d21fc0033c6..02c2de31196e0 100644
+index a6d21fc0033c..02c2de31196e 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)
 --- 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)


@@ -337,13 +337,14 @@ index a6d21fc0033c6..02c2de31196e0 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
                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 5744a3fc47169..f2f4c5ec69530 100644
+index e34edb775334..08ac00a002a7 100644

 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h

-@@ -1895,6 +1895,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1902,6 +1902,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,

        unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  
        unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  

++#if IS_ENABLED(CONFIG_AUFS_FS)

 +extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int);
 +extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[],
 +                                    int);
 +extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int);
 +extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[],
 +                                    int);


@@ -365,35 +366,53 @@ index 5744a3fc47169..f2f4c5ec69530 100644
 +                                                        __LINE__)
 +#define vmr_fput(region)              vmr_do_fput(region, __func__, __LINE__)
 +#endif /* !CONFIG_MMU */
 +                                                        __LINE__)
 +#define vmr_fput(region)              vmr_do_fput(region, __func__, __LINE__)
 +#endif /* !CONFIG_MMU */

++
++#else
++
++#define vma_file_update_time(vma)     file_update_time((vma)->vm_file)
++#define vma_pr_or_file(vma)           (vma)->vm_file
++#define vma_get_file(vma)             get_file((vma)->vm_file)
++#define vma_fput(vma)                 fput((vma)->vm_file)
++
++#ifndef CONFIG_MMU
++#define vmr_pr_or_file(region)                (region)->vm_file
++#define vmr_fput(region)              fput((region)->vm_file)
++#endif /* !CONFIG_MMU */
++
++#endif /* CONFIG_AUFS_FS */

 +
  extern int access_process_vm(struct task_struct *tsk, unsigned long addr,
                void *buf, int len, unsigned int gup_flags);
  extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
 +
  extern int access_process_vm(struct task_struct *tsk, unsigned long addr,
                void *buf, int len, unsigned int gup_flags);
  extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h

-index 0f549870da6a0..67d02ae46b8fa 100644
+index 8834e38c06a4..628b7d1eedbd 100644

 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h

-@@ -344,6 +344,7 @@ struct vm_region {
+@@ -362,6 +362,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 */
        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 */

++#if IS_ENABLED(CONFIG_AUFS_FS)

 +      struct file     *vm_prfile;     /* the virtual backing file or NULL */
 +      struct file     *vm_prfile;     /* the virtual backing file or NULL */

++#endif

  
        int             vm_usage;       /* region usage count (access under nommu_region_sem) */
        bool            vm_icache_flushed : 1; /* true if the icache has been flushed for
  
        int             vm_usage;       /* region usage count (access under nommu_region_sem) */
        bool            vm_icache_flushed : 1; /* true if the icache has been flushed for

-@@ -440,6 +441,7 @@ struct vm_area_struct {
+@@ -458,6 +461,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). */
        unsigned long vm_pgoff;         /* Offset (within vm_file) in PAGE_SIZE
                                           units */
        struct file * vm_file;          /* File we map to (can be NULL). */

++#if IS_ENABLED(CONFIG_AUFS_FS)

 +      struct file *vm_prfile;         /* shadow of vm_file */
 +      struct file *vm_prfile;         /* shadow of vm_file */

++#endif

        void * vm_private_data;         /* was vm_pte (shared mem) */
  
  #ifdef CONFIG_SWAP
 diff --git a/kernel/fork.c b/kernel/fork.c
        void * vm_private_data;         /* was vm_pte (shared mem) */
  
  #ifdef CONFIG_SWAP
 diff --git a/kernel/fork.c b/kernel/fork.c

-index f1e89007f2288..f085ecd96a7db 100644
+index 9796897560ab..67c5046f47b8 100644

 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 --- a/kernel/fork.c
 +++ b/kernel/fork.c

-@@ -575,7 +575,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -664,7 +664,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,

                if (file) {
                        struct address_space *mapping = file->f_mapping;
  
                if (file) {
                        struct address_space *mapping = file->f_mapping;
  


@@ -403,23 +422,19 @@ index f1e89007f2288..f085ecd96a7db 100644
                        if (tmp->vm_flags & VM_SHARED)
                                mapping_allow_writable(mapping);
 diff --git a/mm/Makefile b/mm/Makefile
                        if (tmp->vm_flags & VM_SHARED)
                                mapping_allow_writable(mapping);
 diff --git a/mm/Makefile b/mm/Makefile

-index 70d4309c9ce33..9acff75987dfa 100644
+index 4cc13f3179a5..a1bbb3af3fc2 100644

 --- a/mm/Makefile
 +++ b/mm/Makefile
 --- a/mm/Makefile
 +++ b/mm/Makefile

-@@ -54,7 +54,7 @@ obj-y                        := filemap.o mempool.o oom_kill.o fadvise.o \
-                          mm_init.o percpu.o slab_common.o \
-                          compaction.o vmacache.o \
-                          interval_tree.o list_lru.o workingset.o \
--                         debug.o gup.o mmap_lock.o $(mmu-y)
-+                         prfile.o debug.o gup.o mmap_lock.o $(mmu-y)
- 
- # Give 'page_alloc' its own module-parameter namespace
- page-alloc-y := page_alloc.o
+@@ -133,3 +133,4 @@ obj-$(CONFIG_PAGE_REPORTING) += page_reporting.o
+ obj-$(CONFIG_IO_MAPPING) += io-mapping.o
+ obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o
+ obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o
++obj-$(CONFIG_AUFS_FS:m=y) += prfile.o

 diff --git a/mm/filemap.c b/mm/filemap.c
 diff --git a/mm/filemap.c b/mm/filemap.c

-index ad8c39d90bf94..f95b595a49b7b 100644
+index 3a5ffb5587cd..6d12a6337a60 100644

 --- a/mm/filemap.c
 +++ b/mm/filemap.c
 --- a/mm/filemap.c
 +++ b/mm/filemap.c

-@@ -3395,7 +3395,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -3422,7 +3422,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);
        vm_fault_t ret = VM_FAULT_LOCKED;
  
        sb_start_pagefault(mapping->host->i_sb);


@@ -429,7 +444,7 @@ index ad8c39d90bf94..f95b595a49b7b 100644
        if (folio->mapping != mapping) {
                folio_unlock(folio);
 diff --git a/mm/mmap.c b/mm/mmap.c
        if (folio->mapping != mapping) {
                folio_unlock(folio);
 diff --git a/mm/mmap.c b/mm/mmap.c

-index f61a15474dd6d..071c0cd6ef623 100644
+index 3aa839f81e63..9dfe979e8c2b 100644

 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -184,7 +184,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -184,7 +184,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)


@@ -450,7 +465,7 @@ index f61a15474dd6d..071c0cd6ef623 100644
                }
                if (next->anon_vma)
                        anon_vma_merge(vma, next);
                }
                if (next->anon_vma)
                        anon_vma_merge(vma, next);

-@@ -1879,7 +1879,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1877,7 +1877,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,

        return addr;
  
  unmap_and_free_vma:
        return addr;
  
  unmap_and_free_vma:


@@ -477,25 +492,26 @@ index f61a15474dd6d..071c0cd6ef623 100644
        unlink_anon_vmas(new);
   out_free_mpol:
        mpol_put(vma_policy(new));
        unlink_anon_vmas(new);
   out_free_mpol:
        mpol_put(vma_policy(new));

-@@ -2950,7 +2950,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
-       struct vm_area_struct *vma;
+@@ -2929,6 +2929,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,

        unsigned long populate = 0;
        unsigned long ret = -EINVAL;
        unsigned long populate = 0;
        unsigned long ret = -EINVAL;

--      struct file *file;
-+      struct file *file, *prfile;
+       struct file *file;
++#if IS_ENABLED(CONFIG_AUFS_FS)
++      struct file *prfile;
++#endif

  
        pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
                     current->comm, current->pid);
  
        pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
                     current->comm, current->pid);

-@@ -3006,10 +3006,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2984,10 +2987,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,

        if (vma->vm_flags & VM_LOCKED)
                flags |= MAP_LOCKED;
  
        if (vma->vm_flags & VM_LOCKED)
                flags |= MAP_LOCKED;
  

--      file = get_file(vma->vm_file);
++#if IS_ENABLED(CONFIG_AUFS_FS)

 +      vma_get_file(vma);
 +      file = vma->vm_file;
 +      prfile = vma->vm_prfile;
 +      vma_get_file(vma);
 +      file = vma->vm_file;
 +      prfile = vma->vm_prfile;

-       ret = do_mmap(vma->vm_file, start, size,
-                       prot, flags, pgoff, &populate, NULL);
++      ret = do_mmap(vma->vm_file, start, size,
++                      prot, flags, pgoff, &populate, NULL);

 +      if (!IS_ERR_VALUE(ret) && file && prfile) {
 +              struct vm_area_struct *new_vma;
 +
 +      if (!IS_ERR_VALUE(ret) && file && prfile) {
 +              struct vm_area_struct *new_vma;
 +


@@ -509,13 +525,19 @@ index f61a15474dd6d..071c0cd6ef623 100644
 +       * two fput()s instead of vma_fput(vma),
 +       * coz vma may not be available anymore.
 +       */
 +       * two fput()s instead of vma_fput(vma),
 +       * coz vma may not be available anymore.
 +       */

-       fput(file);
++      fput(file);

 +      if (prfile)
 +              fput(prfile);
 +      if (prfile)
 +              fput(prfile);

++#else
+       file = get_file(vma->vm_file);
+       ret = do_mmap(vma->vm_file, start, size,
+                       prot, flags, pgoff, &populate, NULL);
+       fput(file);
++#endif /* CONFIG_AUFS_FS */

  out:
        mmap_write_unlock(mm);
        if (populate)
  out:
        mmap_write_unlock(mm);
        if (populate)

-@@ -3291,7 +3308,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3261,7 +3288,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)
                if (anon_vma_clone(new_vma, vma))
                        goto out_free_mempol;
                if (new_vma->vm_file)


@@ -525,7 +547,7 @@ index f61a15474dd6d..071c0cd6ef623 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
                        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 55a9e48a7a026..8dc77ce96335a 100644
+index 55a9e48a7a02..8dc77ce96335 100644

 --- a/mm/nommu.c
 +++ b/mm/nommu.c
 @@ -522,7 +522,7 @@ static void __put_nommu_region(struct vm_region *region)
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
 @@ -522,7 +522,7 @@ static void __put_nommu_region(struct vm_region *region)


@@ -570,7 +592,7 @@ index 55a9e48a7a026..8dc77ce96335a 100644
  
 diff --git a/mm/prfile.c b/mm/prfile.c
 new file mode 100644
  
 diff --git a/mm/prfile.c b/mm/prfile.c
 new file mode 100644

-index 0000000000000..511543ab1b418
+index 000000000000..511543ab1b41

 --- /dev/null
 +++ b/mm/prfile.c
 @@ -0,0 +1,86 @@
 --- /dev/null
 +++ b/mm/prfile.c
 @@ -0,0 +1,86 @@


@@ -664,7 +686,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
 aufs5.x-rcN standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c

-index 6f4f48c828351..7ce9e4401f08a 100644
+index cddcf2e44930..8e24a158ef4f 100644

 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1450,6 +1450,7 @@ void d_walk(struct dentry *parent, void *data,
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
 @@ -1450,6 +1450,7 @@ void d_walk(struct dentry *parent, void *data,


@@ -675,7 +697,7 @@ index 6f4f48c828351..7ce9e4401f08a 100644
  
  struct check_mount {
        struct vfsmount *mnt;
  
  struct check_mount {
        struct vfsmount *mnt;

-@@ -2995,6 +2996,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2996,6 +2997,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)

  
        write_sequnlock(&rename_lock);
  }
  
        write_sequnlock(&rename_lock);
  }


@@ -684,10 +706,10 @@ index 6f4f48c828351..7ce9e4401f08a 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c

-index 79f2c9483302d..d9bc22409be6a 100644
+index e3e55d5e0be1..145d95db8bc9 100644

 --- a/fs/exec.c
 +++ b/fs/exec.c
 --- a/fs/exec.c
 +++ b/fs/exec.c

-@@ -112,6 +112,7 @@ bool path_noexec(const struct path *path)
+@@ -111,6 +111,7 @@ bool path_noexec(const struct path *path)

        return (path->mnt->mnt_flags & MNT_NOEXEC) ||
               (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
  }
        return (path->mnt->mnt_flags & MNT_NOEXEC) ||
               (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
  }


@@ -696,7 +718,7 @@ index 79f2c9483302d..d9bc22409be6a 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c

-index 02382fa9bd341..3418c60b90146 100644
+index d91d1bf393cc..3417421651d5 100644

 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)


@@ -708,7 +730,7 @@ index 02382fa9bd341..3418c60b90146 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
  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 7d2e692b66a94..91942789c49aa 100644
+index ada8fe814db9..4ebcd56ea4f0 100644

 --- a/fs/file_table.c
 +++ b/fs/file_table.c
 @@ -198,6 +198,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
 @@ -198,6 +198,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)


@@ -720,10 +742,10 @@ index 7d2e692b66a94..91942789c49aa 100644
  /*
   * Variant of alloc_empty_file() that doesn't check and modify nr_files.
 diff --git a/fs/namespace.c b/fs/namespace.c
  /*
   * Variant of alloc_empty_file() that doesn't check and modify nr_files.
 diff --git a/fs/namespace.c b/fs/namespace.c

-index e189393b34b14..5d7d122d1067a 100644
+index 7a54c6b514a2..ddae5f68ac19 100644

 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 --- a/fs/namespace.c
 +++ b/fs/namespace.c

-@@ -440,6 +440,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
+@@ -456,6 +456,7 @@ void __mnt_drop_write(struct vfsmount *mnt)

        mnt_dec_writers(real_mount(mnt));
        preempt_enable();
  }
        mnt_dec_writers(real_mount(mnt));
        preempt_enable();
  }


@@ -731,7 +753,7 @@ index e189393b34b14..5d7d122d1067a 100644
  
  /**
   * mnt_drop_write - give up write access to a mount
  
  /**
   * mnt_drop_write - give up write access to a mount

-@@ -844,6 +845,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
+@@ -857,6 +858,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)

  {
        return check_mnt(real_mount(mnt));
  }
  {
        return check_mnt(real_mount(mnt));
  }


@@ -739,7 +761,7 @@ index e189393b34b14..5d7d122d1067a 100644
  
  /*
   * vfsmount lock must be held for write
  
  /*
   * vfsmount lock must be held for write

-@@ -2047,6 +2049,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -2060,6 +2062,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,

        }
        return 0;
  }
        }
        return 0;
  }


@@ -748,7 +770,7 @@ index e189393b34b14..5d7d122d1067a 100644
  static void lock_mnt_tree(struct mount *mnt)
  {
 diff --git a/fs/notify/group.c b/fs/notify/group.c
  static void lock_mnt_tree(struct mount *mnt)
  {
 diff --git a/fs/notify/group.c b/fs/notify/group.c

-index b7d4d64f87c29..2d2d2c6d33e41 100644
+index b7d4d64f87c2..2d2d2c6d33e4 100644

 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
 @@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
 @@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_group *group)


@@ -760,7 +782,7 @@ index b7d4d64f87c29..2d2d2c6d33e41 100644
  /*
   * Drop a reference to a group.  Free it if it's through.
 diff --git a/fs/open.c b/fs/open.c
  /*
   * Drop a reference to a group.  Free it if it's through.
 diff --git a/fs/open.c b/fs/open.c

-index 9ff2f621b760b..3b8deceee506f 100644
+index 1315253e0247..46d9235f3a85 100644

 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -66,6 +66,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -66,6 +66,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,


@@ -772,10 +794,10 @@ index 9ff2f621b760b..3b8deceee506f 100644
  long vfs_truncate(const struct path *path, loff_t length)
  {
 diff --git a/fs/read_write.c b/fs/read_write.c
  long vfs_truncate(const struct path *path, loff_t length)
  {
 diff --git a/fs/read_write.c b/fs/read_write.c

-index 0074afa7ecb3e..612cf04d9f6b9 100644
+index e643aec2b0ef..87acd61a0180 100644

 --- a/fs/read_write.c
 +++ b/fs/read_write.c
 --- a/fs/read_write.c
 +++ b/fs/read_write.c

-@@ -488,6 +488,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
+@@ -489,6 +489,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)

        inc_syscr(current);
        return ret;
  }
        inc_syscr(current);
        return ret;
  }


@@ -783,7 +805,7 @@ index 0074afa7ecb3e..612cf04d9f6b9 100644
  
  static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
  {
  
  static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
  {

-@@ -598,6 +599,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
+@@ -599,6 +600,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_

        file_end_write(file);
        return ret;
  }
        file_end_write(file);
        return ret;
  }


@@ -792,7 +814,7 @@ index 0074afa7ecb3e..612cf04d9f6b9 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
  /* 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 3e6ba363b7775..7c1be373eb7cd 100644
+index a21caa5c54c8..ccf9e1681eb7 100644

 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -766,6 +766,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,


@@ -812,7 +834,7 @@ index 3e6ba363b7775..7c1be373eb7cd 100644
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/fs/xattr.c b/fs/xattr.c
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/fs/xattr.c b/fs/xattr.c

-index 5c8c5175b385c..ff7e9ff774b73 100644
+index 5c8c5175b385..ff7e9ff774b7 100644

 --- a/fs/xattr.c
 +++ b/fs/xattr.c
 @@ -384,6 +384,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
 @@ -384,6 +384,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,


@@ -824,10 +846,10 @@ index 5c8c5175b385c..ff7e9ff774b73 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
  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 43e3d1fdd570b..5d6f33f1f2f28 100644
+index 9d7c317899e1..ddfdeeec39d6 100644

 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c

-@@ -210,6 +210,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+@@ -208,6 +208,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)

         */
        return lock_classes + class_idx;
  }
         */
        return lock_classes + class_idx;
  }


@@ -836,7 +858,7 @@ index 43e3d1fdd570b..5d6f33f1f2f28 100644
  
  #ifdef CONFIG_LOCK_STAT
 diff --git a/kernel/task_work.c b/kernel/task_work.c
  
  #ifdef CONFIG_LOCK_STAT
 diff --git a/kernel/task_work.c b/kernel/task_work.c

-index 1698fbe6f0e13..081b05acadf82 100644
+index c59e1a49bc40..8af926a7276d 100644

 --- a/kernel/task_work.c
 +++ b/kernel/task_work.c
 @@ -167,3 +167,4 @@ void task_work_run(void)
 --- a/kernel/task_work.c
 +++ b/kernel/task_work.c
 @@ -167,3 +167,4 @@ void task_work_run(void)


@@ -845,10 +867,10 @@ index 1698fbe6f0e13..081b05acadf82 100644
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/security.c b/security/security.c
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
 diff --git a/security/security.c b/security/security.c

-index 22261d79f3333..732e4c219ea29 100644
+index b7cf5cbfdc67..37f2d9d3d08c 100644

 --- a/security/security.c
 +++ b/security/security.c
 --- a/security/security.c
 +++ b/security/security.c

-@@ -1151,6 +1151,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -1164,6 +1164,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)

                return 0;
        return call_int_hook(path_rmdir, 0, dir, dentry);
  }
                return 0;
        return call_int_hook(path_rmdir, 0, dir, dentry);
  }


@@ -856,7 +878,7 @@ index 22261d79f3333..732e4c219ea29 100644
  
  int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {
  
  int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {

-@@ -1167,6 +1168,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1180,6 +1181,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 0;
        return call_int_hook(path_symlink, 0, dir, dentry, old_name);
  }


@@ -864,7 +886,7 @@ index 22261d79f3333..732e4c219ea29 100644
  
  int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
                       struct dentry *new_dentry)
  
  int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
                       struct dentry *new_dentry)

-@@ -1175,6 +1177,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1188,6 +1190,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 0;
        return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
  }


@@ -872,7 +894,7 @@ index 22261d79f3333..732e4c219ea29 100644
  
  int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
                         const struct path *new_dir, struct dentry *new_dentry,
  
  int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
                         const struct path *new_dir, struct dentry *new_dentry,

-@@ -1202,6 +1205,7 @@ int security_path_truncate(const struct path *path)
+@@ -1215,6 +1218,7 @@ int security_path_truncate(const struct path *path)

                return 0;
        return call_int_hook(path_truncate, 0, path);
  }
                return 0;
        return call_int_hook(path_truncate, 0, path);
  }


@@ -880,7 +902,7 @@ index 22261d79f3333..732e4c219ea29 100644
  
  int security_path_chmod(const struct path *path, umode_t mode)
  {
  
  int security_path_chmod(const struct path *path, umode_t mode)
  {

-@@ -1209,6 +1213,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1222,6 +1226,7 @@ int security_path_chmod(const struct path *path, umode_t mode)

                return 0;
        return call_int_hook(path_chmod, 0, path, mode);
  }
                return 0;
        return call_int_hook(path_chmod, 0, path, mode);
  }


@@ -888,7 +910,7 @@ index 22261d79f3333..732e4c219ea29 100644
  
  int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {
  
  int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {

-@@ -1216,6 +1221,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1229,6 +1234,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 0;
        return call_int_hook(path_chown, 0, path, uid, gid);
  }


@@ -896,7 +918,7 @@ index 22261d79f3333..732e4c219ea29 100644
  
  int security_path_chroot(const struct path *path)
  {
  
  int security_path_chroot(const struct path *path)
  {

-@@ -1316,6 +1322,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -1329,6 +1335,7 @@ int security_inode_permission(struct inode *inode, int mask)

                return 0;
        return call_int_hook(inode_permission, 0, inode, mask);
  }
                return 0;
        return call_int_hook(inode_permission, 0, inode, mask);
  }


@@ -904,7 +926,7 @@ index 22261d79f3333..732e4c219ea29 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {

-@@ -1513,6 +1520,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -1526,6 +1533,7 @@ int security_file_permission(struct file *file, int mask)

  
        return fsnotify_perm(file, mask);
  }
  
        return fsnotify_perm(file, mask);
  }


@@ -12302,8 +12324,8 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
 +#endif /* __AUFS_DIRREN_H__ */
 diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 --- /usr/share/empty/fs/aufs/dynop.c   1970-01-01 01:00:00.000000000 +0100
 +#endif /* __AUFS_DIRREN_H__ */
 diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 --- /usr/share/empty/fs/aufs/dynop.c   1970-01-01 01:00:00.000000000 +0100

-+++ linux/fs/aufs/dynop.c      2022-03-21 14:49:05.723299677 +0100
-@@ -0,0 +1,368 @@
++++ linux/fs/aufs/dynop.c      2022-05-23 09:44:37.726505832 +0200
+@@ -0,0 +1,367 @@

 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2010-2021 Junjiro R. Okajima
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2010-2021 Junjiro R. Okajima


@@ -12484,13 +12506,12 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 +      DySetAop(writepage);
 +      DySetAopForce(readpage);        /* force */
 +      DySetAop(writepages);
 +      DySetAop(writepage);
 +      DySetAopForce(readpage);        /* force */
 +      DySetAop(writepages);

-+      DySetAop(set_page_dirty);
-+      DySetAop(readpages);
++      DySetAop(dirty_folio);
++      DySetAop(invalidate_folio);

 +      DySetAop(readahead);
 +      DySetAop(write_begin);
 +      DySetAop(write_end);
 +      DySetAop(bmap);
 +      DySetAop(readahead);
 +      DySetAop(write_begin);
 +      DySetAop(write_end);
 +      DySetAop(bmap);

-+      DySetAop(invalidatepage);

 +      DySetAop(releasepage);
 +      DySetAop(freepage);
 +      /* this one will be changed according to an aufs mount option */
 +      DySetAop(releasepage);
 +      DySetAop(freepage);
 +      /* this one will be changed according to an aufs mount option */


@@ -12498,7 +12519,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 +      DySetAop(migratepage);
 +      DySetAop(isolate_page);
 +      DySetAop(putback_page);
 +      DySetAop(migratepage);
 +      DySetAop(isolate_page);
 +      DySetAop(putback_page);

-+      DySetAop(launder_page);
++      DySetAop(launder_folio);

 +      DySetAop(is_partially_uptodate);
 +      DySetAop(is_dirty_writeback);
 +      DySetAop(error_remove_page);
 +      DySetAop(is_partially_uptodate);
 +      DySetAop(is_dirty_writeback);
 +      DySetAop(error_remove_page);


@@ -14020,8 +14041,8 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 +}
 diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 --- /usr/share/empty/fs/aufs/file.c    1970-01-01 01:00:00.000000000 +0100
 +}
 diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 --- /usr/share/empty/fs/aufs/file.c    1970-01-01 01:00:00.000000000 +0100

-+++ linux/fs/aufs/file.c       2022-03-21 14:49:05.723299677 +0100
-@@ -0,0 +1,863 @@
++++ linux/fs/aufs/file.c       2022-05-23 09:44:37.729839166 +0200
+@@ -0,0 +1,861 @@

 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2021 Junjiro R. Okajima
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2021 Junjiro R. Okajima


@@ -14825,10 +14846,9 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +static int aufs_writepage(struct page *page, struct writeback_control *wbc)
 +{ AuUnsupport(); return 0; }
 +
 +static int aufs_writepage(struct page *page, struct writeback_control *wbc)
 +{ AuUnsupport(); return 0; }
 +

-+static int aufs_set_page_dirty(struct page *page)
-+{ AuUnsupport(); return 0; }
-+static void aufs_invalidatepage(struct page *page, unsigned int offset,
-+                              unsigned int length)
++static bool aufs_dirty_folio(struct address_space *mapping, struct folio *folio)
++{ AuUnsupport(); return true; }
++static void aufs_invalidate_folio(struct folio *folio, size_t offset, size_t len)

 +{ AuUnsupport(); }
 +static int aufs_releasepage(struct page *page, gfp_t gfp)
 +{ AuUnsupport(); return 0; }
 +{ AuUnsupport(); }
 +static int aufs_releasepage(struct page *page, gfp_t gfp)
 +{ AuUnsupport(); return 0; }


@@ -14841,12 +14861,11 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +{ AuUnsupport(); return true; }
 +static void aufs_putback_page(struct page *page)
 +{ AuUnsupport(); }
 +{ AuUnsupport(); return true; }
 +static void aufs_putback_page(struct page *page)
 +{ AuUnsupport(); }

-+static int aufs_launder_page(struct page *page)
-+{ AuUnsupport(); return 0; }
-+static int aufs_is_partially_uptodate(struct page *page,
-+                                    unsigned long from,
-+                                    unsigned long count)
++static int aufs_launder_folio(struct folio *folio)

 +{ AuUnsupport(); return 0; }
 +{ AuUnsupport(); return 0; }

++static bool aufs_is_partially_uptodate(struct folio *folio, size_t from,
++                                    size_t count)
++{ AuUnsupport(); return true; }

 +static void aufs_is_dirty_writeback(struct page *page, bool *dirty,
 +                                  bool *writeback)
 +{ AuUnsupport(); }
 +static void aufs_is_dirty_writeback(struct page *page, bool *dirty,
 +                                  bool *writeback)
 +{ AuUnsupport(); }


@@ -14866,18 +14885,18 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +#ifdef CONFIG_AUFS_DEBUG
 +      .writepage              = aufs_writepage,
 +      /* no writepages, because of writepage */
 +#ifdef CONFIG_AUFS_DEBUG
 +      .writepage              = aufs_writepage,
 +      /* no writepages, because of writepage */

-+      .set_page_dirty         = aufs_set_page_dirty,
++      .dirty_folio            = aufs_dirty_folio,

 +      /* no readpages, because of readpage */
 +      .write_begin            = aufs_write_begin,
 +      .write_end              = aufs_write_end,
 +      /* no bmap, no block device */
 +      /* no readpages, because of readpage */
 +      .write_begin            = aufs_write_begin,
 +      .write_end              = aufs_write_end,
 +      /* no bmap, no block device */

-+      .invalidatepage         = aufs_invalidatepage,
++      .invalidate_folio       = aufs_invalidate_folio,

 +      .releasepage            = aufs_releasepage,
 +      /* is fallback_migrate_page ok? */
 +      /* .migratepage         = aufs_migratepage, */
 +      .isolate_page           = aufs_isolate_page,
 +      .putback_page           = aufs_putback_page,
 +      .releasepage            = aufs_releasepage,
 +      /* is fallback_migrate_page ok? */
 +      /* .migratepage         = aufs_migratepage, */
 +      .isolate_page           = aufs_isolate_page,
 +      .putback_page           = aufs_putback_page,

-+      .launder_page           = aufs_launder_page,
++      .launder_folio          = aufs_launder_folio,

 +      .is_partially_uptodate  = aufs_is_partially_uptodate,
 +      .is_dirty_writeback     = aufs_is_dirty_writeback,
 +      .error_remove_page      = aufs_error_remove_page,
 +      .is_partially_uptodate  = aufs_is_partially_uptodate,
 +      .is_dirty_writeback     = aufs_is_dirty_writeback,
 +      .error_remove_page      = aufs_error_remove_page,


@@ -25929,8 +25948,8 @@ 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
 +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-03-21 14:49:05.726633010 +0100
-@@ -0,0 +1,166 @@
++++ linux/fs/aufs/module.h     2022-05-23 09:44:37.729839166 +0200
+@@ -0,0 +1,180 @@

 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
 + * Copyright (C) 2005-2021 Junjiro R. Okajima
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
 + * Copyright (C) 2005-2021 Junjiro R. Okajima


@@ -26068,9 +26087,11 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 +      kmem_cache_create(#type, sizeof(struct type), \
 +                        __alignof__(struct type), AuCacheFlags, ctor)
 +
 +      kmem_cache_create(#type, sizeof(struct type), \
 +                        __alignof__(struct type), AuCacheFlags, ctor)
 +

-+#define AuCacheFuncs(name, index)                                     \
++#define AuCacheFuncAlloc(name, index)                                 \

 +      static inline struct au_##name *au_cache_alloc_##name(void)     \
 +      static inline struct au_##name *au_cache_alloc_##name(void)     \

-+      { return kmem_cache_alloc(au_cache[AuCache_##index], GFP_NOFS); } \
++      { return kmem_cache_alloc(au_cache[AuCache_##index], GFP_NOFS); }
++
++#define AuCacheFuncs(name, index)                                     \

 +      static inline void au_cache_free_##name##_norcu(struct au_##name *p) \
 +      { kmem_cache_free(au_cache[AuCache_##index], p); }              \
 +                                                                      \
 +      static inline void au_cache_free_##name##_norcu(struct au_##name *p) \
 +      { kmem_cache_free(au_cache[AuCache_##index], p); }              \
 +                                                                      \


@@ -26087,12 +26108,24 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 +              au_cache_free_##name##_rcu(p); }
 +
 +AuCacheFuncs(dinfo, DINFO);
 +              au_cache_free_##name##_rcu(p); }
 +
 +AuCacheFuncs(dinfo, DINFO);

++AuCacheFuncAlloc(dinfo, DINFO);
++

 +AuCacheFuncs(icntnr, ICNTNR);
 +AuCacheFuncs(icntnr, ICNTNR);

++static inline struct au_icntnr *au_cache_alloc_icntnr(struct super_block *sb)
++{ return alloc_inode_sb(sb, au_cache[AuCache_ICNTNR], GFP_NOFS); }
++

 +AuCacheFuncs(finfo, FINFO);
 +AuCacheFuncs(finfo, FINFO);

++AuCacheFuncAlloc(finfo, FINFO);
++

 +AuCacheFuncs(vdir, VDIR);
 +AuCacheFuncs(vdir, VDIR);

++AuCacheFuncAlloc(vdir, VDIR);
++

 +AuCacheFuncs(vdir_dehstr, DEHSTR);
 +AuCacheFuncs(vdir_dehstr, DEHSTR);

++AuCacheFuncAlloc(vdir_dehstr, DEHSTR);
++

 +#ifdef CONFIG_AUFS_HNOTIFY
 +AuCacheFuncs(hnotify, HNOTIFY);
 +#ifdef CONFIG_AUFS_HNOTIFY
 +AuCacheFuncs(hnotify, HNOTIFY);

++AuCacheFuncAlloc(hnotify, HNOTIFY);

 +#endif
 +
 +#endif /* __KERNEL__ */
 +#endif
 +
 +#endif /* __KERNEL__ */


@@ -29773,7 +29806,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
 +}
 diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 --- /usr/share/empty/fs/aufs/super.c   1970-01-01 01:00:00.000000000 +0100

-+++ linux/fs/aufs/super.c      2022-03-21 14:49:05.729966343 +0100
++++ linux/fs/aufs/super.c      2022-05-23 09:44:37.729839166 +0200

 @@ -0,0 +1,871 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 @@ -0,0 +1,871 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*


@@ -29811,7 +29844,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 +{
 +      struct au_icntnr *c;
 +
 +{
 +      struct au_icntnr *c;
 +

-+      c = au_cache_alloc_icntnr();
++      c = au_cache_alloc_icntnr(sb);

 +      if (c) {
 +              au_icntnr_init(c);
 +              inode_set_iversion(&c->vfs_inode, 1); /* sigen(sb); */
 +      if (c) {
 +              au_icntnr_init(c);
 +              inode_set_iversion(&c->vfs_inode, 1); /* sigen(sb); */


@@ -31244,8 +31277,8 @@ 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
 +#endif /* __AUFS_SUPER_H__ */
 diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
 --- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100

-+++ linux/fs/aufs/sysaufs.c    2022-03-21 14:49:05.729966343 +0100
-@@ -0,0 +1,93 @@
++++ linux/fs/aufs/sysaufs.c    2022-05-23 09:44:37.729839166 +0200
+@@ -0,0 +1,94 @@

 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2021 Junjiro R. Okajima
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2021 Junjiro R. Okajima


@@ -31285,6 +31318,7 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
 +      &sysaufs_si_attr_xi_path.attr,
 +      NULL,
 +};
 +      &sysaufs_si_attr_xi_path.attr,
 +      NULL,
 +};

++ATTRIBUTE_GROUPS(sysaufs_si);

 +
 +static const struct sysfs_ops au_sbi_ops = {
 +      .show   = sysaufs_si_show
 +
 +static const struct sysfs_ops au_sbi_ops = {
 +      .show   = sysaufs_si_show


@@ -31293,7 +31327,7 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
 +static struct kobj_type au_sbi_ktype = {
 +      .release        = au_si_free,
 +      .sysfs_ops      = &au_sbi_ops,
 +static struct kobj_type au_sbi_ktype = {
 +      .release        = au_si_free,
 +      .sysfs_ops      = &au_sbi_ops,

-+      .default_attrs  = sysaufs_si_attrs
++      .default_groups = sysaufs_si_groups

 +};
 +
 +/* ---------------------------------------------------------------------- */
 +};
 +
 +/* ---------------------------------------------------------------------- */


@@ -38934,7 +38968,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
 +}
 diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
 --- /usr/share/empty/include/uapi/linux/aufs_type.h    1970-01-01 01:00:00.000000000 +0100

-+++ linux/include/uapi/linux/aufs_type.h       2022-03-21 14:49:05.733299677 +0100
++++ linux/include/uapi/linux/aufs_type.h       2022-05-23 09:44:37.729839166 +0200

 @@ -0,0 +1,452 @@
 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +/*
 @@ -0,0 +1,452 @@
 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +/*


@@ -38978,7 +39012,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +#include <limits.h>
 +#endif /* __KERNEL__ */
 +
 +#include <limits.h>
 +#endif /* __KERNEL__ */
 +

-+#define AUFS_VERSION  "5.x-rcN-20220314"
++#define AUFS_VERSION  "5.x-rcN-20220418"

 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC      ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC      ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')


@@ -39392,10 +39426,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs5.x-rcN loopback patch
 
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
 aufs5.x-rcN loopback patch
 
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c

-index 9009a0efc4b28..60307b90fbead 100644
+index ba35d0d6847a..63e256b40842 100644

 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c

-@@ -510,6 +510,15 @@ static inline void loop_update_dio(struct loop_device *lo)
+@@ -509,6 +509,15 @@ static inline void loop_update_dio(struct loop_device *lo)

                                lo->use_dio);
  }
  
                                lo->use_dio);
  }
  


@@ -39411,7 +39445,7 @@ index 9009a0efc4b28..60307b90fbead 100644
  static void loop_reread_partitions(struct loop_device *lo)
  {
        int rc;
  static void loop_reread_partitions(struct loop_device *lo)
  {
        int rc;

-@@ -567,6 +576,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -566,6 +575,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,

  {
        struct file *file = fget(arg);
        struct file *old_file;
  {
        struct file *file = fget(arg);
        struct file *old_file;


@@ -39419,7 +39453,7 @@ index 9009a0efc4b28..60307b90fbead 100644
        int error;
        bool partscan;
        bool is_loop;
        int error;
        bool partscan;
        bool is_loop;

-@@ -586,11 +596,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -585,11 +595,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,

        if (!(lo->lo_flags & LO_FLAGS_READ_ONLY))
                goto out_err;
  
        if (!(lo->lo_flags & LO_FLAGS_READ_ONLY))
                goto out_err;
  


@@ -39439,7 +39473,7 @@ index 9009a0efc4b28..60307b90fbead 100644
  
        error = -EINVAL;
  
  
        error = -EINVAL;
  

-@@ -603,6 +621,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -602,6 +620,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;
        blk_mq_freeze_queue(lo->lo_queue);
        mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
        lo->lo_backing_file = file;


@@ -39447,7 +39481,7 @@ index 9009a0efc4b28..60307b90fbead 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));
        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));

-@@ -625,6 +644,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -624,6 +643,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,

         * dependency.
         */
        fput(old_file);
         * dependency.
         */
        fput(old_file);


@@ -39456,7 +39490,7 @@ index 9009a0efc4b28..60307b90fbead 100644
        if (partscan)
                loop_reread_partitions(lo);
        return 0;
        if (partscan)
                loop_reread_partitions(lo);
        return 0;

-@@ -633,6 +654,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -632,6 +653,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,

        loop_global_unlock(lo, is_loop);
  out_putf:
        fput(file);
        loop_global_unlock(lo, is_loop);
  out_putf:
        fput(file);


@@ -39465,7 +39499,7 @@ index 9009a0efc4b28..60307b90fbead 100644
        return error;
  }
  
        return error;
  }
  

-@@ -971,6 +994,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -970,6 +993,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,

                          const struct loop_config *config)
  {
        struct file *file = fget(config->fd);
                          const struct loop_config *config)
  {
        struct file *file = fget(config->fd);


@@ -39473,7 +39507,7 @@ index 9009a0efc4b28..60307b90fbead 100644
        struct inode *inode;
        struct address_space *mapping;
        int error;
        struct inode *inode;
        struct address_space *mapping;
        int error;

-@@ -986,6 +1010,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -985,6 +1009,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,

        /* This is safe, since we have a reference from open(). */
        __module_get(THIS_MODULE);
  
        /* This is safe, since we have a reference from open(). */
        __module_get(THIS_MODULE);
  


@@ -39487,7 +39521,7 @@ index 9009a0efc4b28..60307b90fbead 100644
        /*
         * If we don't hold exclusive handle for the device, upgrade to it
         * here to avoid changing device under exclusive owner.
        /*
         * If we don't hold exclusive handle for the device, upgrade to it
         * here to avoid changing device under exclusive owner.

-@@ -1051,6 +1082,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1050,6 +1081,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,

        lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
        lo->lo_device = bdev;
        lo->lo_backing_file = file;
        lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
        lo->lo_device = bdev;
        lo->lo_backing_file = file;


@@ -39495,7 +39529,7 @@ index 9009a0efc4b28..60307b90fbead 100644
        lo->old_gfp_mask = mapping_gfp_mask(mapping);
        mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
  
        lo->old_gfp_mask = mapping_gfp_mask(mapping);
        mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
  

-@@ -1101,6 +1133,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1100,6 +1132,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,

                bd_abort_claiming(bdev, loop_configure);
  out_putf:
        fput(file);
                bd_abort_claiming(bdev, loop_configure);
  out_putf:
        fput(file);


@@ -39504,7 +39538,7 @@ index 9009a0efc4b28..60307b90fbead 100644
        /* This is safe: open() is still holding a reference. */
        module_put(THIS_MODULE);
        return error;
        /* This is safe: open() is still holding a reference. */
        module_put(THIS_MODULE);
        return error;

-@@ -1109,6 +1143,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
+@@ -1108,6 +1142,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,

  static void __loop_clr_fd(struct loop_device *lo, bool release)
  {
        struct file *filp;
  static void __loop_clr_fd(struct loop_device *lo, bool release)
  {
        struct file *filp;


@@ -39512,7 +39546,7 @@ index 9009a0efc4b28..60307b90fbead 100644
        gfp_t gfp = lo->old_gfp_mask;
        struct loop_worker *pos, *worker;
  
        gfp_t gfp = lo->old_gfp_mask;
        struct loop_worker *pos, *worker;
  

-@@ -1154,6 +1189,7 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1153,6 +1188,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;
        spin_lock_irq(&lo->lo_lock);
        filp = lo->lo_backing_file;
        lo->lo_backing_file = NULL;


@@ -39520,7 +39554,7 @@ index 9009a0efc4b28..60307b90fbead 100644
        spin_unlock_irq(&lo->lo_lock);
  
        lo->lo_device = NULL;
        spin_unlock_irq(&lo->lo_lock);
  
        lo->lo_device = NULL;

-@@ -1215,6 +1251,8 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1214,6 +1250,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);
         * fput can take open_mutex which is usually taken before lo_mutex.
         */
        fput(filp);


@@ -39530,7 +39564,7 @@ index 9009a0efc4b28..60307b90fbead 100644
  
  static int loop_clr_fd(struct loop_device *lo)
 diff --git a/drivers/block/loop.h b/drivers/block/loop.h
  
  static int loop_clr_fd(struct loop_device *lo)
 diff --git a/drivers/block/loop.h b/drivers/block/loop.h

-index 082d4b6bfc6a6..61feca64688df 100644
+index 082d4b6bfc6a..61feca64688d 100644

 --- a/drivers/block/loop.h
 +++ b/drivers/block/loop.h
 @@ -34,7 +34,7 @@ struct loop_device {
 --- a/drivers/block/loop.h
 +++ b/drivers/block/loop.h
 @@ -34,7 +34,7 @@ struct loop_device {


@@ -39543,7 +39577,7 @@ index 082d4b6bfc6a6..61feca64688df 100644
  
        gfp_t           old_gfp_mask;
 diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
  
        gfp_t           old_gfp_mask;
 diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c

-index 99ceca1440449..e49dfe8550329 100644
+index 99ceca144044..e49dfe855032 100644

 --- a/fs/aufs/f_op.c
 +++ b/fs/aufs/f_op.c
 @@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
 --- a/fs/aufs/f_op.c
 +++ b/fs/aufs/f_op.c
 @@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)


@@ -39556,7 +39590,7 @@ index 99ceca1440449..e49dfe8550329 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
                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 74347bd75b380..5ef888a1d53f4 100644
+index 74347bd75b38..5ef888a1d53f 100644

 --- a/fs/aufs/loop.c
 +++ b/fs/aufs/loop.c
 @@ -133,3 +133,19 @@ void au_loopback_fin(void)
 --- a/fs/aufs/loop.c
 +++ b/fs/aufs/loop.c
 @@ -133,3 +133,19 @@ void au_loopback_fin(void)


@@ -39580,7 +39614,7 @@ index 74347bd75b380..5ef888a1d53f4 100644
 +      return f;
 +}
 diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
 +      return f;
 +}
 diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h

-index 7293bee427f96..3345c098d0d47 100644
+index 7293bee427f9..3345c098d0d4 100644

 --- a/fs/aufs/loop.h
 +++ b/fs/aufs/loop.h
 @@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
 --- a/fs/aufs/loop.h
 +++ b/fs/aufs/loop.h
 @@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);


@@ -39602,7 +39636,7 @@ index 7293bee427f96..3345c098d0d47 100644
  
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
  
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c

-index 90043afec51c1..0835f6da42d97 100644
+index 7d9bcc074c87..0eefe350c01c 100644

 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
 @@ -758,7 +758,10 @@ const struct super_operations aufs_sop = {
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
 @@ -758,7 +758,10 @@ const struct super_operations aufs_sop = {


@@ -39618,10 +39652,10 @@ index 90043afec51c1..0835f6da42d97 100644
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h

-index 5479e6dc18a23..05fe92d076c19 100644
+index 06c9242932a2..9190ce754010 100644

 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h

-@@ -2137,6 +2137,10 @@ struct super_operations {
+@@ -2113,6 +2113,10 @@ struct super_operations {

                                  struct shrink_control *);
        long (*free_cached_objects)(struct super_block *,
                                    struct shrink_control *);
                                  struct shrink_control *);
        long (*free_cached_objects)(struct super_block *,
                                    struct shrink_control *);

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 7a497ca9cecef084c69d43f2489508cafbd13069..1e1889f49420ef2203b1a63e5213975cde5c64cd 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -68,9 +68,11 @@ X86_AMD_PLATFORM_DEVICE all=y
 X86_CPA_STATISTICS all=y
 X86_DEBUG_FPU all=n
 X86_DECODER_SELFTEST all=n
 X86_CPA_STATISTICS all=y
 X86_DEBUG_FPU all=n
 X86_DECODER_SELFTEST all=n

+X86_KERNEL_IBT all=n

 X86_MCELOG_LEGACY all=y
 X86_SGX all=y
 X86_VERBOSE_BOOTUP all=n
 X86_MCELOG_LEGACY all=y
 X86_SGX all=y
 X86_VERBOSE_BOOTUP all=n

+X86_X32_ABI all=y

 XEN_512GB all=y
 XEN_DOM0 all=y
 XEN_PV all=y
 XEN_512GB all=y
 XEN_DOM0 all=y
 XEN_PV all=y


@@ -82,6 +84,7 @@ XEN_PVHVM_GUEST all=y
 #- *** FILE: block/Kconfig ***
 #-
 BLOCK all=y
 #- *** FILE: block/Kconfig ***
 #-
 BLOCK all=y

+BLOCK_LEGACY_AUTOLOAD all=y

 BLK_DEV_BSGLIB all=y
 BLK_DEV_INTEGRITY all=y
 BLK_DEV_ZONED all=y
 BLK_DEV_BSGLIB all=y
 BLK_DEV_INTEGRITY all=y
 BLK_DEV_ZONED all=y


@@ -178,6 +181,7 @@ CRYPTO_TEST all=m
 #- Public-key cryptography
 CRYPTO_RSA all=y
 CRYPTO_DH all=y
 #- Public-key cryptography
 CRYPTO_RSA all=y
 CRYPTO_DH all=y

+CRYPTO_DH_RFC7919_GROUPS all=y

 CRYPTO_ECDH all=m
 CRYPTO_ECDSA all=m
 CRYPTO_ECRDSA all=m
 CRYPTO_ECDH all=m
 CRYPTO_ECDSA all=m
 CRYPTO_ECRDSA all=m


@@ -239,6 +243,7 @@ CRYPTO_SHA256 all=y
 CRYPTO_SHA512 all=m
 CRYPTO_SHA3 all=m
 CRYPTO_SM3 all=m
 CRYPTO_SHA512 all=m
 CRYPTO_SHA3 all=m
 CRYPTO_SM3 all=m

+CRYPTO_SM3_AVX_X86_64 all=m

 CRYPTO_STREEBOG all=m
 CRYPTO_WP512 all=m
 CRYPTO_GHASH_CLMUL_NI_INTEL all=m
 CRYPTO_STREEBOG all=m
 CRYPTO_WP512 all=m
 CRYPTO_GHASH_CLMUL_NI_INTEL all=m


@@ -310,10 +315,8 @@ CRYPTO_STATS all=y
 #-
 ASYMMETRIC_KEY_TYPE all=y
 ASYMMETRIC_PUBLIC_KEY_SUBTYPE all=y
 #-
 ASYMMETRIC_KEY_TYPE all=y
 ASYMMETRIC_PUBLIC_KEY_SUBTYPE all=y

-ASYMMETRIC_TPM_KEY_SUBTYPE all=m

 X509_CERTIFICATE_PARSER all=y
 PKCS8_PRIVATE_KEY_PARSER all=m
 X509_CERTIFICATE_PARSER all=y
 PKCS8_PRIVATE_KEY_PARSER all=m

-TPM_KEY_PARSER all=m

 PKCS7_MESSAGE_PARSER all=y
 PKCS7_TEST_KEY all=m
 SIGNED_PE_FILE_VERIFICATION all=y
 PKCS7_MESSAGE_PARSER all=y
 PKCS7_TEST_KEY all=m
 SIGNED_PE_FILE_VERIFICATION all=y


@@ -786,7 +789,7 @@ VEXPRESS_CONFIG arm=m arm64=y
 #- file drivers/bus/mhi/Kconfig goes here
 
 #-
 #- file drivers/bus/mhi/Kconfig goes here
 
 #-

-#- *** FILE: drivers/bus/mhi/Kconfig ***
+#- *** FILE: drivers/bus/mhi/host/Kconfig ***

 #-
 MHI_BUS all=m
 MHI_BUS_DEBUG all=n
 #-
 MHI_BUS all=m
 MHI_BUS_DEBUG all=n


@@ -972,6 +975,7 @@ COMMON_CLK_FIXED_MMIO arm=n arm64=n
 #- file drivers/clk/mediatek/Kconfig goes here
 #- file drivers/clk/meson/Kconfig goes here
 #- file drivers/clk/mstar/Kconfig goes here
 #- file drivers/clk/mediatek/Kconfig goes here
 #- file drivers/clk/meson/Kconfig goes here
 #- file drivers/clk/mstar/Kconfig goes here

+#- file drivers/clk/microchip/Kconfig goes here

 #- file drivers/clk/mvebu/Kconfig goes here
 #- file drivers/clk/pistachio/Kconfig goes here
 #- file drivers/clk/qcom/Kconfig goes here
 #- file drivers/clk/mvebu/Kconfig goes here
 #- file drivers/clk/pistachio/Kconfig goes here
 #- file drivers/clk/qcom/Kconfig goes here


@@ -1258,6 +1262,7 @@ CPU_IDLE_GOV_HALTPOLL all=y
 #- file drivers/cpuidle/Kconfig.arm goes here
 #- file drivers/cpuidle/Kconfig.mips goes here
 #- file drivers/cpuidle/Kconfig.powerpc goes here
 #- file drivers/cpuidle/Kconfig.arm goes here
 #- file drivers/cpuidle/Kconfig.mips goes here
 #- file drivers/cpuidle/Kconfig.powerpc goes here

+#- file drivers/cpuidle/Kconfig.riscv goes here

 HALTPOLL_CPUIDLE all=m
 
 #-
 HALTPOLL_CPUIDLE all=m
 
 #-


@@ -1354,10 +1359,11 @@ CRYPTO_DEV_VIRTIO all=m
 #- *** FILE: drivers/cxl/Kconfig ***
 #-
 CXL_BUS all=m
 #- *** FILE: drivers/cxl/Kconfig ***
 #-
 CXL_BUS all=m

-CXL_MEM all=m
+CXL_PCI all=m

 CXL_MEM_RAW_COMMANDS all=y
 CXL_ACPI=m
 CXL_PMEM=m
 CXL_MEM_RAW_COMMANDS all=y
 CXL_ACPI=m
 CXL_PMEM=m

+CXL_MEM all=m

 
 #-
 #- *** FILE: drivers/dax/Kconfig ***
 
 #-
 #- *** FILE: drivers/dax/Kconfig ***


@@ -1884,6 +1890,7 @@ DRM_VKMS all=m
 #- file drivers/gpu/drm/tidss/Kconfig goes here
 #- file drivers/gpu/drm/xlnx/Kconfig goes here
 #- file drivers/gpu/drm/gud/Kconfig goes here
 #- file drivers/gpu/drm/tidss/Kconfig goes here
 #- file drivers/gpu/drm/xlnx/Kconfig goes here
 #- file drivers/gpu/drm/gud/Kconfig goes here

+#- file drivers/gpu/drm/solomon/Kconfig goes here

 #- file drivers/gpu/drm/sprd/Kconfig goes here
 DRM_HYPERV=m
 DRM_LEGACY all=y
 #- file drivers/gpu/drm/sprd/Kconfig goes here
 DRM_HYPERV=m
 DRM_LEGACY all=y


@@ -2216,7 +2223,6 @@ 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_SITRONIX_ST7701 arm=m arm64=m
 DRM_PANEL_SITRONIX_ST7703 arm=m arm64=m
 DRM_PANEL_SITRONIX_ST7789V arm=m arm64=m

-DRM_PANEL_SONY_ACX424AKP arm=m arm64=m

 DRM_PANEL_SONY_ACX565AKM arm=m arm64=m
 DRM_PANEL_SONY_TULIP_TRULY_NT35521 arm=m arm64=m
 DRM_PANEL_TDO_TL070WSH30 arm=m arm64=m
 DRM_PANEL_SONY_ACX565AKM arm=m arm64=m
 DRM_PANEL_SONY_TULIP_TRULY_NT35521 arm=m arm64=m
 DRM_PANEL_TDO_TL070WSH30 arm=m arm64=m


@@ -2269,6 +2275,12 @@ ROCKCHIP_LVDS arm64=y
 ROCKCHIP_RGB arm64=y
 ROCKCHIP_RK3066_HDMI arm64=n
 
 ROCKCHIP_RGB arm64=y
 ROCKCHIP_RK3066_HDMI arm64=n
 

+#-
+#- *** FILE: drivers/gpu/drm/solomon/Kconfig ***
+#-
+DRM_SSD130X all=m
+DRM_SSD130X_I2C all=m
+

 #-
 #- *** FILE: drivers/gpu/drm/sti/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/gpu/drm/sti/Kconfig ***
 #-


@@ -2297,6 +2309,7 @@ DRM_ARCPGU arm=m arm64=m
 DRM_BOCHS all=m
 DRM_CIRRUS_QEMU all=m
 DRM_GM12U320 all=m
 DRM_BOCHS all=m
 DRM_CIRRUS_QEMU all=m
 DRM_GM12U320 all=m

+DRM_PANEL_MIPI_DBI all=m

 DRM_SIMPLEDRM=m
 TINYDRM_HX8357D all=m
 TINYDRM_ILI9163 all=m
 DRM_SIMPLEDRM=m
 TINYDRM_HX8357D all=m
 TINYDRM_ILI9163 all=m


@@ -2360,8 +2373,6 @@ IMX_IPUV3_CORE arm=m
 #-
 #- *** FILE: drivers/gpu/vga/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/gpu/vga/Kconfig ***
 #-

-VGA_ARB all=y
-VGA_ARB_MAX_GPUS all=16

 VGA_SWITCHEROO all=y
 
 #-
 VGA_SWITCHEROO all=y
 
 #-


@@ -2461,12 +2472,14 @@ HID_PICOLCD_LEDS all=y
 HID_PLANTRONICS all=m
 HID_PLAYSTATION all=m
 PLAYSTATION_FF all=y
 HID_PLANTRONICS all=m
 HID_PLAYSTATION all=m
 PLAYSTATION_FF all=y

+HID_RAZER all=m

 HID_PRIMAX all=m
 HID_RETRODE all=m
 HID_ROCCAT all=m
 HID_SAITEK all=m
 HID_SAMSUNG all=m
 HID_SEMITEK all=m
 HID_PRIMAX all=m
 HID_RETRODE all=m
 HID_ROCCAT all=m
 HID_SAITEK all=m
 HID_SAMSUNG all=m
 HID_SEMITEK all=m

+HID_SIGMAMICRO all=m

 HID_SONY all=m
 SONY_FF all=y
 HID_SPEEDLINK all=m
 HID_SONY all=m
 SONY_FF all=y
 HID_SPEEDLINK all=m


@@ -2599,6 +2612,8 @@ SENSORS_CORSAIR_PSU all=m
 SENSORS_DRIVETEMP all=m
 SENSORS_DS620 all=m
 SENSORS_DS1621 all=m
 SENSORS_DRIVETEMP all=m
 SENSORS_DS620 all=m
 SENSORS_DS1621 all=m

+SENSORS_DELL_SMM all=m
+I8K all=y

 SENSORS_DA9052_ADC all=m
 SENSORS_I5K_AMB all=m
 SENSORS_F71805F all=m
 SENSORS_DA9052_ADC all=m
 SENSORS_I5K_AMB all=m
 SENSORS_F71805F all=m


@@ -2684,6 +2699,7 @@ SENSORS_NZXT_KRAKEN2 all=m
 SENSORS_NZXT_SMART2 all=m
 #- file drivers/hwmon/occ/Kconfig goes here
 SENSORS_PCF8591 all=m
 SENSORS_NZXT_SMART2 all=m
 #- file drivers/hwmon/occ/Kconfig goes here
 SENSORS_PCF8591 all=m

+#- file drivers/hwmon/peci/Kconfig goes here

 #- file drivers/hwmon/pmbus/Kconfig goes here
 SENSORS_PWM_FAN arm=m arm64=m
 SENSORS_RASPBERRYPI_HWMON arm=m
 #- file drivers/hwmon/pmbus/Kconfig goes here
 SENSORS_PWM_FAN arm=m arm64=m
 SENSORS_RASPBERRYPI_HWMON arm=m


@@ -2696,6 +2712,7 @@ SENSORS_SHT3x all=m
 SENSORS_SHT4x=m
 SENSORS_SHTC1 all=m
 SENSORS_SIS5595 all=m
 SENSORS_SHT4x=m
 SENSORS_SHTC1 all=m
 SENSORS_SIS5595 all=m

+SENSORS_SY7636A all=m

 SENSORS_DME1737 all=m
 SENSORS_EMC1403 all=m
 SENSORS_EMC2103 all=m
 SENSORS_DME1737 all=m
 SENSORS_EMC1403 all=m
 SENSORS_EMC2103 all=m


@@ -2722,6 +2739,7 @@ SENSORS_TMP103 all=m
 SENSORS_TMP108 all=m
 SENSORS_TMP401 all=m
 SENSORS_TMP421 all=m
 SENSORS_TMP108 all=m
 SENSORS_TMP401 all=m
 SENSORS_TMP421 all=m

+SENSORS_TMP464 all=m

 SENSORS_TMP513 all=m
 SENSORS_VEXPRESS arm=m arm64=m
 SENSORS_VIA_CPUTEMP all=m
 SENSORS_TMP513 all=m
 SENSORS_VEXPRESS arm=m arm64=m
 SENSORS_VIA_CPUTEMP all=m


@@ -2749,6 +2767,7 @@ SENSORS_ACPI_POWER all=m
 SENSORS_ATK0110 all=m
 SENSORS_ASUS_WMI all=m
 SENSORS_ASUS_WMI_EC all=m
 SENSORS_ATK0110 all=m
 SENSORS_ASUS_WMI all=m
 SENSORS_ASUS_WMI_EC all=m

+SENSORS_ASUS_EC all=m

 
 #-
 #- *** FILE: drivers/hwmon/occ/Kconfig ***
 
 #-
 #- *** FILE: drivers/hwmon/occ/Kconfig ***


@@ -2756,6 +2775,12 @@ SENSORS_ASUS_WMI_EC all=m
 SENSORS_OCC_P8_I2C all=m
 SENSORS_OCC_P9_SBE arm=m arm64=m
 
 SENSORS_OCC_P8_I2C all=m
 SENSORS_OCC_P9_SBE arm=m arm64=m
 

+#-
+#- *** FILE: drivers/hwmon/peci/Kconfig ***
+#-
+SENSORS_PECI_CPUTEMP all=m
+SENSORS_PECI_DIMMTEMP all=m
+

 #-
 #- *** FILE: drivers/hwmon/pmbus/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/hwmon/pmbus/Kconfig ***
 #-


@@ -2777,6 +2802,7 @@ SENSORS_IR38064_REGULATOR all=y
 SENSORS_IRPS5401 all=m
 SENSORS_ISL68137 all=m
 SENSORS_LM25066 all=m
 SENSORS_IRPS5401 all=m
 SENSORS_ISL68137 all=m
 SENSORS_LM25066 all=m

+SENSORS_LM25066_REGULATOR all=y

 SENSORS_LTC2978 all=m
 SENSORS_LTC2978_REGULATOR all=y
 SENSORS_LTC3815 all=m
 SENSORS_LTC2978 all=m
 SENSORS_LTC2978_REGULATOR all=y
 SENSORS_LTC3815 all=m


@@ -2792,6 +2818,8 @@ SENSORS_MP2888=m
 SENSORS_MP2975 all=m
 SENSORS_MP5023 all=m
 SENSORS_PIM4328=m
 SENSORS_MP2975 all=m
 SENSORS_MP5023 all=m
 SENSORS_PIM4328=m

+SENSORS_PLI1209BC all=m
+SENSORS_PLI1209BC_REGULATOR all=y

 SENSORS_PM6764TR all=m
 SENSORS_PXE1610 all=m
 SENSORS_Q54SJ108A2 all=m
 SENSORS_PM6764TR all=m
 SENSORS_PXE1610 all=m
 SENSORS_Q54SJ108A2 all=m


@@ -2801,6 +2829,7 @@ SENSORS_TPS53679 all=m
 SENSORS_UCD9000 all=m
 SENSORS_UCD9200 all=m
 SENSORS_XDPE122 all=m
 SENSORS_UCD9000 all=m
 SENSORS_UCD9200 all=m
 SENSORS_XDPE122 all=m

+SENSORS_XDPE122_REGULATOR all=y

 SENSORS_ZL6100 all=m
 
 #-
 SENSORS_ZL6100 all=m
 
 #-


@@ -2899,6 +2928,7 @@ I2C_CADENCE arm64=m
 I2C_CBUS_GPIO all=m
 I2C_DESIGNWARE_SLAVE all=y
 I2C_DESIGNWARE_PLATFORM all=m
 I2C_CBUS_GPIO all=m
 I2C_DESIGNWARE_SLAVE all=y
 I2C_DESIGNWARE_PLATFORM all=m

+I2C_DESIGNWARE_AMDPSP all=y

 I2C_DESIGNWARE_BAYTRAIL all=y
 I2C_DESIGNWARE_PCI all=m
 I2C_EG20T all=m
 I2C_DESIGNWARE_BAYTRAIL all=y
 I2C_DESIGNWARE_PCI all=m
 I2C_EG20T all=m


@@ -3022,6 +3052,8 @@ ADXL313_I2C all=m
 ADXL313_SPI all=m
 ADXL355_I2C all=m
 ADXL355_SPI all=m
 ADXL313_SPI all=m
 ADXL355_I2C all=m
 ADXL355_SPI all=m

+ADXL367_SPI all=m
+ADXL367_I2C all=m

 ADXL372_SPI all=m
 ADXL372_I2C all=m
 BMA180 all=m
 ADXL372_SPI all=m
 ADXL372_I2C all=m
 BMA180 all=m


@@ -3065,6 +3097,7 @@ AD7091R5 all=m
 AD7124 all=m
 AD7192 all=m
 AD7266 all=m
 AD7124 all=m
 AD7192 all=m
 AD7266 all=m

+AD7280 all=m

 AD7291 all=m
 AD7292 all=m
 AD7298 all=m
 AD7291 all=m
 AD7292 all=m
 AD7298 all=m


@@ -3155,6 +3188,7 @@ IIO_RESCALE arm=m arm64=m
 #- *** FILE: drivers/iio/amplifiers/Kconfig ***
 #-
 AD8366 all=m
 #- *** FILE: drivers/iio/amplifiers/Kconfig ***
 #-
 AD8366 all=m

+ADA4250 all=m

 HMC425 all=m
 
 #-
 HMC425 all=m
 
 #-


@@ -3219,6 +3253,7 @@ AD5592R all=m
 AD5593R all=m
 AD5504 all=m
 AD5624R_SPI all=m
 AD5593R all=m
 AD5504 all=m
 AD5624R_SPI all=m

+LTC2688 all=m

 AD5686 all=m
 AD5686_SPI all=m
 AD5696_I2C all=m
 AD5686 all=m
 AD5686_SPI all=m
 AD5696_I2C all=m


@@ -3267,6 +3302,8 @@ AD9523 all=m
 ADF4350 all=m
 ADF4371 all=m
 ADMV1013 all=m
 ADF4350 all=m
 ADF4371 all=m
 ADMV1013 all=m

+ADMV1014 all=m
+ADMV4420 all=m

 ADRF6780 all=m
 
 #-
 ADRF6780 all=m
 
 #-


@@ -3283,6 +3320,8 @@ FXAS21002C all=m
 HID_SENSOR_GYRO_3D all=m
 MPU3050_I2C all=m
 IIO_ST_GYRO_3AXIS all=m
 HID_SENSOR_GYRO_3D all=m
 MPU3050_I2C all=m
 IIO_ST_GYRO_3AXIS all=m

+IIO_ST_GYRO_I2C_3AXIS all=m
+IIO_ST_GYRO_SPI_3AXIS all=m

 ITG3200 all=m
 
 #-
 ITG3200 all=m
 
 #-


@@ -3352,6 +3391,8 @@ IIO_ST_LSM6DSX_SPI all=m
 #- *** FILE: drivers/iio/imu/st_lsm9ds0/Kconfig ***
 #-
 IIO_ST_LSM9DS0=m
 #- *** FILE: drivers/iio/imu/st_lsm9ds0/Kconfig ***
 #-
 IIO_ST_LSM9DS0=m

+IIO_ST_LSM9DS0_I2C all=m
+IIO_ST_LSM9DS0_SPI all=m

 
 #-
 #- *** FILE: drivers/iio/light/Kconfig ***
 
 #-
 #- *** FILE: drivers/iio/light/Kconfig ***


@@ -3486,6 +3527,8 @@ MS5611_I2C all=m
 MS5611_SPI all=m
 MS5637 all=m
 IIO_ST_PRESS all=m
 MS5611_SPI all=m
 MS5637 all=m
 IIO_ST_PRESS all=m

+IIO_ST_PRESS_I2C all=m
+IIO_ST_PRESS_SPI all=m

 T5403 all=m
 HP206C all=m
 ZPA2326 all=m
 T5403 all=m
 HP206C all=m
 ZPA2326 all=m


@@ -3502,6 +3545,8 @@ PING all=m
 RFD77402 all=m
 SRF04 all=m
 SX9310 all=m
 RFD77402 all=m
 SRF04 all=m
 SX9310 all=m

+SX9324 all=m
+SX9360 all=m

 SX9500 all=m
 SRF08 all=m
 VCNL3020 all=m
 SX9500 all=m
 SRF08 all=m
 VCNL3020 all=m


@@ -4026,6 +4071,7 @@ TOUCHSCREEN_MMS114 all=m
 TOUCHSCREEN_MELFAS_MIP4 all=m
 TOUCHSCREEN_MSG2638 all=m
 TOUCHSCREEN_MTOUCH all=m
 TOUCHSCREEN_MELFAS_MIP4 all=m
 TOUCHSCREEN_MSG2638 all=m
 TOUCHSCREEN_MTOUCH all=m

+TOUCHSCREEN_IMAGIS all=m

 TOUCHSCREEN_IMX6UL_TSC arm=m arm64=m
 TOUCHSCREEN_INEXIO all=m
 TOUCHSCREEN_MK712 all=m sparc=n
 TOUCHSCREEN_IMX6UL_TSC arm=m arm64=m
 TOUCHSCREEN_INEXIO all=m
 TOUCHSCREEN_MK712 all=m sparc=n


@@ -4443,14 +4489,15 @@ DVB_CORE all=m
 #- file drivers/media/mc/Kconfig goes here
 #- file drivers/media/dvb-core/Kconfig goes here
 #- Drivers filtered as selected at 'Filter media drivers'
 #- file drivers/media/mc/Kconfig goes here
 #- file drivers/media/dvb-core/Kconfig goes here
 #- Drivers filtered as selected at 'Filter media drivers'

+#- 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/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/test-drivers/Kconfig goes here
 #- file drivers/media/firewire/Kconfig goes here
 #- file drivers/media/platform/Kconfig goes here
 #- file drivers/media/mmc/Kconfig goes here
 #- file drivers/media/test-drivers/Kconfig goes here
 #- file drivers/media/firewire/Kconfig goes here

+#- file drivers/media/common/Kconfig goes here

 MEDIA_ATTACH all=y
 #- file drivers/media/i2c/Kconfig goes here
 #- file drivers/media/spi/Kconfig goes here
 MEDIA_ATTACH all=y
 #- file drivers/media/i2c/Kconfig goes here
 #- file drivers/media/spi/Kconfig goes here


@@ -4498,11 +4545,11 @@ USB_RAINSHADOW_CEC all=m
 #- common driver options
 VIDEO_CX2341X all=m
 VIDEO_TVEEPROM all=m
 #- common driver options
 VIDEO_CX2341X all=m
 VIDEO_TVEEPROM all=m

-#- file drivers/media/common/videobuf2/Kconfig goes here

 #- file drivers/media/common/b2c2/Kconfig goes here
 #- file drivers/media/common/saa7146/Kconfig goes here
 #- file drivers/media/common/siano/Kconfig goes here
 #- file drivers/media/common/v4l2-tpg/Kconfig goes here
 #- file drivers/media/common/b2c2/Kconfig goes here
 #- file drivers/media/common/saa7146/Kconfig goes here
 #- file drivers/media/common/siano/Kconfig goes here
 #- file drivers/media/common/v4l2-tpg/Kconfig goes here

+#- file drivers/media/common/videobuf2/Kconfig goes here

 
 #-
 #- *** FILE: drivers/media/common/b2c2/Kconfig ***
 
 #-
 #- *** FILE: drivers/media/common/b2c2/Kconfig ***


@@ -4554,43 +4601,43 @@ DVB_CX24123 all=m
 DVB_MT312 all=m
 DVB_S5H1420 all=m
 DVB_STV0299 all=m
 DVB_MT312 all=m
 DVB_S5H1420 all=m
 DVB_STV0299 all=m

-DVB_TDA8083 all=m

 DVB_TDA10086 all=m
 DVB_TDA10086 all=m

-DVB_VES1X93 all=m
+DVB_TDA8083 all=m

 DVB_TDA826X all=m
 DVB_TUA6100 all=m
 DVB_TDA826X all=m
 DVB_TUA6100 all=m

+DVB_VES1X93 all=m

 #- DVB-T (terrestrial) frontends
 #- DVB-T (terrestrial) frontends

-DVB_SP887X all=m

 DVB_CX22700 all=m
 DVB_CX22702 all=m
 DVB_CX22700 all=m
 DVB_CX22702 all=m

-DVB_DRXD all=m
-DVB_L64781 all=m
-DVB_TDA1004X all=m
-DVB_NXT6000 all=m
-DVB_MT352 all=m
-DVB_ZL10353 all=m
+DVB_CXD2820R all=m

 DVB_DIB3000MB all=m
 DVB_DIB3000MC all=m
 DVB_DIB7000M all=m
 DVB_DIB7000P all=m
 DVB_DIB3000MB all=m
 DVB_DIB3000MC all=m
 DVB_DIB7000M all=m
 DVB_DIB7000P all=m

-DVB_TDA10048 all=m
-DVB_STV0367 all=m
-DVB_CXD2820R all=m
+DVB_DRXD all=m
+DVB_L64781 all=m
+DVB_MT352 all=m
+DVB_NXT6000 all=m

 DVB_RTL2832_SDR all=m
 DVB_RTL2832_SDR all=m

+DVB_SP887X all=m
+DVB_STV0367 all=m
+DVB_TDA10048 all=m
+DVB_TDA1004X all=m
+DVB_ZL10353 all=m

 #- file drivers/media/dvb-frontends/cxd2880/Kconfig goes here
 #- DVB-C (cable) frontends
 #- file drivers/media/dvb-frontends/cxd2880/Kconfig goes here
 #- DVB-C (cable) frontends

-DVB_VES1820 all=m
+DVB_STV0297 all=m

 DVB_TDA10021 all=m
 DVB_TDA10023 all=m
 DVB_TDA10021 all=m
 DVB_TDA10023 all=m

-DVB_STV0297 all=m
+DVB_VES1820 all=m

 #- ATSC (North American/Korean Terrestrial/Cable DTV) frontends
 #- ATSC (North American/Korean Terrestrial/Cable DTV) frontends

-DVB_NXT200X all=m
-DVB_OR51211 all=m
-DVB_OR51132 all=m
+DVB_AU8522 all=m

 DVB_BCM3510 all=m
 DVB_LGDT330X all=m
 DVB_BCM3510 all=m
 DVB_LGDT330X all=m

+DVB_NXT200X all=m
+DVB_OR51132 all=m
+DVB_OR51211 all=m

 DVB_S5H1409 all=m
 DVB_S5H1409 all=m

-DVB_AU8522 all=m

 DVB_S5H1411 all=m
 #- ISDB-T (terrestrial) frontends
 DVB_S921 all=m
 DVB_S5H1411 all=m
 #- ISDB-T (terrestrial) frontends
 DVB_S921 all=m


@@ -4599,11 +4646,11 @@ DVB_S921 all=m
 DVB_PLL all=m
 DVB_TUNER_DIB0070 all=m
 #- SEC control devices for DVB-S
 DVB_PLL all=m
 DVB_TUNER_DIB0070 all=m
 #- SEC control devices for DVB-S

-#- file drivers/media/dvb-frontends/drx39xyj/Kconfig goes here
-DVB_LNBP21 all=m

 DVB_ISL6405 all=m
 DVB_ISL6421 all=m
 DVB_LGS8GL5 all=m
 DVB_ISL6405 all=m
 DVB_ISL6421 all=m
 DVB_LGS8GL5 all=m

+DVB_LNBP21 all=m
+#- file drivers/media/dvb-frontends/drx39xyj/Kconfig goes here

 #- Common Interface (EN50221) controller drivers
 DVB_CXD2099 all=m
 DVB_SP2 all=m
 #- Common Interface (EN50221) controller drivers
 DVB_CXD2099 all=m
 DVB_SP2 all=m


@@ -4619,35 +4666,9 @@ DVB_FIREDTV all=m
 #- *** FILE: drivers/media/i2c/Kconfig ***
 #-
 #- IR I2C driver auto-selected by 'Autoselect ancillary drivers'
 #- *** FILE: drivers/media/i2c/Kconfig ***
 #-
 #- 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
-VIDEO_TEA6415C all=m
-VIDEO_TEA6420 all=m
-VIDEO_MSP3400 all=m
-VIDEO_CS53L32A all=m
-VIDEO_WM8775 all=m
-VIDEO_WM8739 all=m
-VIDEO_VP27SMPX ia64=m
-VIDEO_SAA6588 all=m
-VIDEO_BT819 all=m
-VIDEO_BT856 all=m
-VIDEO_KS0127 all=m
-VIDEO_SAA7110 all=m
-VIDEO_SAA711X all=m
-VIDEO_TVP5150 all=m
-VIDEO_VPX3220 all=m
-#- Video and audio decoders
-#- file drivers/media/i2c/cx25840/Kconfig goes here
-VIDEO_SAA7127 all=m
-VIDEO_SAA7185 all=m
-VIDEO_ADV7170 all=m
-VIDEO_ADV7175 all=m
-VIDEO_UPD64031A all=m
-VIDEO_UPD64083 all=m

 VIDEO_HI556 all=m
 VIDEO_HI846 all=m
 VIDEO_HI556 all=m
 VIDEO_HI846 all=m

+VIDEO_HI847 all=m

 VIDEO_IMX208=m
 VIDEO_IMX214 all=m
 VIDEO_IMX219 all=m
 VIDEO_IMX208=m
 VIDEO_IMX214 all=m
 VIDEO_IMX219 all=m


@@ -4659,7 +4680,21 @@ VIDEO_IMX334 arm=m arm64=m
 VIDEO_IMX335 arm=m arm64=m
 VIDEO_IMX355 all=m
 VIDEO_IMX412 arm=m arm64=m
 VIDEO_IMX335 arm=m arm64=m
 VIDEO_IMX355 all=m
 VIDEO_IMX412 arm=m arm64=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_MT9V011 arm=m arm64=m
+VIDEO_MT9V032 all=m
+VIDEO_MT9V111 all=m
+VIDEO_NOON010PC30 all=m
+VIDEO_OG01A1B all=m

 VIDEO_OV02A10 all=m
 VIDEO_OV02A10 all=m

+VIDEO_OV08D10 all=m
+VIDEO_OV13858 all=m
+VIDEO_OV13B10 all=m

 VIDEO_OV2640 all=m
 VIDEO_OV2659 all=m
 VIDEO_OV2680 all=m
 VIDEO_OV2640 all=m
 VIDEO_OV2659 all=m
 VIDEO_OV2680 all=m


@@ -4669,15 +4704,15 @@ VIDEO_OV5640 arm=m arm64=m
 VIDEO_OV5645 arm=m arm64=m
 VIDEO_OV5647 all=m
 VIDEO_OV5648 all=m
 VIDEO_OV5645 arm=m arm64=m
 VIDEO_OV5647 all=m
 VIDEO_OV5648 all=m

-VIDEO_OV6650 all=m

 VIDEO_OV5670 all=m
 VIDEO_OV5675 all=m
 VIDEO_OV5693 all=m
 VIDEO_OV5695 all=m
 VIDEO_OV5670 all=m
 VIDEO_OV5675 all=m
 VIDEO_OV5693 all=m
 VIDEO_OV5695 all=m

+VIDEO_OV6650 all=m

 VIDEO_OV7251 all=m
 VIDEO_OV7251 all=m

-VIDEO_OV772X all=m

 VIDEO_OV7640 arm=m arm64=m
 VIDEO_OV7670 all=m
 VIDEO_OV7640 arm=m arm64=m
 VIDEO_OV7670 all=m

+VIDEO_OV772X all=m

 VIDEO_OV7740 all=m
 VIDEO_OV8856 all=m
 VIDEO_OV8865 all=m
 VIDEO_OV7740 all=m
 VIDEO_OV8856 all=m
 VIDEO_OV8865 all=m


@@ -4685,31 +4720,19 @@ VIDEO_OV9282 arm=m arm64=m
 VIDEO_OV9640 all=m
 VIDEO_OV9650 all=m
 VIDEO_OV9734 all=m
 VIDEO_OV9640 all=m
 VIDEO_OV9650 all=m
 VIDEO_OV9734 all=m

-VIDEO_OV13858 all=m
-VIDEO_OV13B10 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_MT9V011 arm=m arm64=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_RDACM20 all=m
 VIDEO_RDACM21 all=m
 VIDEO_RJ54N1 all=m
 VIDEO_RDACM20 all=m
 VIDEO_RDACM21 all=m
 VIDEO_RJ54N1 all=m

-VIDEO_S5K6AA all=m
-VIDEO_S5K6A3 all=m
+VIDEO_S5C73M3 all=m

 VIDEO_S5K4ECGX all=m
 VIDEO_S5K5BAF all=m
 VIDEO_S5K4ECGX all=m
 VIDEO_S5K5BAF all=m

+VIDEO_S5K6A3 all=m
+VIDEO_S5K6AA all=m
+VIDEO_SR030PC30 all=m
+VIDEO_VS6624 all=m

 #- file drivers/media/i2c/ccs/Kconfig goes here
 #- file drivers/media/i2c/et8ek8/Kconfig goes here
 #- file drivers/media/i2c/ccs/Kconfig goes here
 #- file drivers/media/i2c/et8ek8/Kconfig goes here

-VIDEO_S5C73M3 all=m
+#- file drivers/media/i2c/m5mols/Kconfig goes here

 VIDEO_AD5820 all=m
 VIDEO_AK7375 all=m
 VIDEO_DW9714 all=m
 VIDEO_AD5820 all=m
 VIDEO_AK7375 all=m
 VIDEO_DW9714 all=m


@@ -4718,6 +4741,33 @@ VIDEO_DW9807_VCM all=m
 VIDEO_ADP1653 all=m
 VIDEO_LM3560 all=m
 VIDEO_LM3646 all=m
 VIDEO_ADP1653 all=m
 VIDEO_LM3560 all=m
 VIDEO_LM3646 all=m

+#- audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'
+VIDEO_CS53L32A all=m
+VIDEO_MSP3400 all=m
+VIDEO_TDA7432 all=m
+VIDEO_TDA9840 all=m
+VIDEO_TEA6415C all=m
+VIDEO_TEA6420 all=m
+VIDEO_TVAUDIO all=m
+VIDEO_VP27SMPX ia64=m
+VIDEO_WM8739 all=m
+VIDEO_WM8775 all=m
+VIDEO_SAA6588 all=m
+VIDEO_BT819 all=m
+VIDEO_BT856 all=m
+VIDEO_KS0127 all=m
+VIDEO_SAA7110 all=m
+VIDEO_SAA711X all=m
+VIDEO_TVP5150 all=m
+VIDEO_VPX3220 all=m
+#- Video and audio decoders
+#- file drivers/media/i2c/cx25840/Kconfig goes here
+VIDEO_ADV7170 all=m
+VIDEO_ADV7175 all=m
+VIDEO_SAA7127 all=m
+VIDEO_SAA7185 all=m
+VIDEO_UPD64031A all=m
+VIDEO_UPD64083 all=m

 
 #-
 #- *** FILE: drivers/media/i2c/ccs/Kconfig ***
 
 #-
 #- *** FILE: drivers/media/i2c/ccs/Kconfig ***


@@ -4763,32 +4813,32 @@ MEDIA_PCI_SUPPORT all=y
 #- file drivers/media/pci/tw68/Kconfig goes here
 #- file drivers/media/pci/tw686x/Kconfig goes here
 #- Media capture/analog TV support
 #- file drivers/media/pci/tw68/Kconfig goes here
 #- file drivers/media/pci/tw686x/Kconfig goes here
 #- Media capture/analog TV support

+#- file drivers/media/pci/dt3155/Kconfig goes here

 #- file drivers/media/pci/ivtv/Kconfig goes here
 #- file drivers/media/pci/saa7146/Kconfig goes here
 #- file drivers/media/pci/ivtv/Kconfig goes here
 #- file drivers/media/pci/saa7146/Kconfig goes here

-#- file drivers/media/pci/dt3155/Kconfig goes here

 #- Media capture/analog/hybrid TV support
 #- Media capture/analog/hybrid TV support

+#- file drivers/media/pci/bt8xx/Kconfig goes here
+#- file drivers/media/pci/cobalt/Kconfig goes here

 #- file drivers/media/pci/cx18/Kconfig goes here
 #- file drivers/media/pci/cx23885/Kconfig goes here
 #- file drivers/media/pci/cx25821/Kconfig goes here
 #- file drivers/media/pci/cx88/Kconfig goes here
 #- file drivers/media/pci/cx18/Kconfig goes here
 #- file drivers/media/pci/cx23885/Kconfig goes here
 #- file drivers/media/pci/cx25821/Kconfig goes here
 #- file drivers/media/pci/cx88/Kconfig goes here

-#- file drivers/media/pci/bt8xx/Kconfig goes here

 #- file drivers/media/pci/saa7134/Kconfig goes here
 #- file drivers/media/pci/saa7164/Kconfig goes here
 #- file drivers/media/pci/saa7134/Kconfig goes here
 #- file drivers/media/pci/saa7164/Kconfig goes here

-#- file drivers/media/pci/cobalt/Kconfig goes here

 #- Media digital TV PCI Adapters
 #- Media digital TV PCI Adapters

-#- file drivers/media/pci/ttpci/Kconfig goes here

 #- file drivers/media/pci/b2c2/Kconfig goes here
 #- file drivers/media/pci/b2c2/Kconfig goes here

-#- file drivers/media/pci/pluto2/Kconfig goes here
+#- file drivers/media/pci/ddbridge/Kconfig goes here

 #- file drivers/media/pci/dm1105/Kconfig goes here
 #- file drivers/media/pci/dm1105/Kconfig goes here

-#- file drivers/media/pci/pt1/Kconfig goes here
-#- file drivers/media/pci/pt3/Kconfig goes here

 #- file drivers/media/pci/mantis/Kconfig goes here
 #- file drivers/media/pci/mantis/Kconfig goes here

+#- file drivers/media/pci/netup_unidvb/Kconfig goes here

 #- file drivers/media/pci/ngene/Kconfig goes here
 #- file drivers/media/pci/ngene/Kconfig goes here

-#- file drivers/media/pci/ddbridge/Kconfig goes here
+#- file drivers/media/pci/pluto2/Kconfig goes here
+#- file drivers/media/pci/pt1/Kconfig goes here
+#- file drivers/media/pci/pt3/Kconfig goes here

 #- file drivers/media/pci/smipcie/Kconfig goes here
 #- 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
+#- file drivers/media/pci/ttpci/Kconfig goes here

 VIDEO_PCI_SKELETON all=m
 VIDEO_PCI_SKELETON all=m

+#- file drivers/media/pci/intel/ipu3/Kconfig goes here

 
 #-
 #- *** FILE: drivers/media/pci/b2c2/Kconfig ***
 
 #-
 #- *** FILE: drivers/media/pci/b2c2/Kconfig ***


@@ -4964,56 +5014,96 @@ VIDEO_TW686X all=m
 #-
 #- *** FILE: drivers/media/platform/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/media/platform/Kconfig ***
 #-

+MEDIA_PLATFORM_DRIVERS all=y

 V4L_PLATFORM_DRIVERS all=y
 V4L_PLATFORM_DRIVERS all=y

-#- file drivers/media/platform/marvell-ccic/Kconfig goes here
-VIDEO_VIA_CAMERA all=m
-#- file drivers/media/platform/cadence/Kconfig goes here
-#- file drivers/media/platform/davinci/Kconfig goes here
-#- file drivers/media/platform/omap/Kconfig goes here
-VIDEO_ASPEED all=m
+SDR_PLATFORM_DRIVERS all=y
+DVB_PLATFORM_DRIVERS all=y
+V4L_MEM2MEM_DRIVERS all=y
+VIDEO_MEM2MEM_DEINTERLACE all=m

 VIDEO_MUX arm=m arm64=m
 VIDEO_MUX arm=m arm64=m

-VIDEO_ROCKCHIP_ISP1 arm64=m
-#- file drivers/media/platform/exynos4-is/Kconfig goes here
-#- file drivers/media/platform/am437x/Kconfig goes here
-#- file drivers/media/platform/xilinx/Kconfig goes here
-#- file drivers/media/platform/rcar-vin/Kconfig goes here
+#- file drivers/media/platform/allegro-dvt/Kconfig goes here
+#- file drivers/media/platform/amlogic/Kconfig goes here
+#- file drivers/media/platform/amphion/Kconfig goes here
+#- file drivers/media/platform/aspeed/Kconfig goes here

 #- file drivers/media/platform/atmel/Kconfig goes here
 #- file drivers/media/platform/atmel/Kconfig goes here

+#- file drivers/media/platform/cadence/Kconfig goes here
+#- file drivers/media/platform/chips-media/Kconfig goes here
+#- file drivers/media/platform/intel/Kconfig goes here
+#- file drivers/media/platform/marvell/Kconfig goes here
+#- file drivers/media/platform/mediatek/Kconfig goes here
+#- file drivers/media/platform/nvidia/Kconfig goes here
+#- file drivers/media/platform/nxp/Kconfig goes here
+#- file drivers/media/platform/qcom/Kconfig goes here
+#- file drivers/media/platform/renesas/Kconfig goes here
+#- file drivers/media/platform/rockchip/Kconfig goes here
+#- file drivers/media/platform/samsung/Kconfig goes here
+#- file drivers/media/platform/st/Kconfig goes here

 #- file drivers/media/platform/sunxi/Kconfig goes here
 #- file drivers/media/platform/sunxi/Kconfig goes here

-V4L_MEM2MEM_DRIVERS all=y
-#- file drivers/media/platform/imx-jpeg/Kconfig goes here
-VIDEO_MEM2MEM_DEINTERLACE all=m
+#- file drivers/media/platform/ti/Kconfig goes here
+#- file drivers/media/platform/via/Kconfig goes here
+#- file drivers/media/platform/xilinx/Kconfig goes here
+
+#-
+#- *** FILE: drivers/media/platform/amlogic/meson-ge2d/Kconfig ***
+#-

 VIDEO_MESON_GE2D arm64=m
 VIDEO_MESON_GE2D arm64=m

-VIDEO_RENESAS_VSP1 all=m
-VIDEO_ROCKCHIP_RGA arm64=m
-DVB_PLATFORM_DRIVERS all=y
-#- file drivers/media/platform/sti/c8sectpfe/Kconfig goes here
-SDR_PLATFORM_DRIVERS all=y
+
+#-
+#- *** FILE: drivers/media/platform/aspeed/Kconfig ***
+#-
+#- Aspeed media platform drivers
+VIDEO_ASPEED all=m

 
 #-
 #- *** FILE: drivers/media/platform/cadence/Kconfig ***
 #-
 
 #-
 #- *** FILE: drivers/media/platform/cadence/Kconfig ***
 #-

-VIDEO_CADENCE all=y
+#- Cadence media platform drivers

 VIDEO_CADENCE_CSI2RX all=m
 VIDEO_CADENCE_CSI2TX all=m
 
 #-
 VIDEO_CADENCE_CSI2RX all=m
 VIDEO_CADENCE_CSI2TX all=m
 
 #-

-#- *** FILE: drivers/media/platform/marvell-ccic/Kconfig ***
+#- *** FILE: drivers/media/platform/marvell/Kconfig ***

 #-
 #-

+#- Marvell media platform drivers

 VIDEO_CAFE_CCIC all=m sparc=n
 
 #-
 VIDEO_CAFE_CCIC all=m sparc=n
 
 #-

-#- *** FILE: drivers/media/platform/rcar-vin/Kconfig ***
+#- *** FILE: drivers/media/platform/renesas/Kconfig ***
+#-
+#- Renesas media platform drivers
+#- file drivers/media/platform/renesas/rcar-vin/Kconfig goes here
+VIDEO_RENESAS_VSP1 all=m
+
+#-
+#- *** FILE: drivers/media/platform/renesas/rcar-vin/Kconfig ***

 #-
 VIDEO_RCAR_VIN all=m
 
 #-
 #-
 VIDEO_RCAR_VIN all=m
 
 #-

-#- *** FILE: drivers/media/platform/sti/c8sectpfe/Kconfig ***
+#- *** FILE: drivers/media/platform/rockchip/rga/Kconfig ***
+#-
+VIDEO_ROCKCHIP_RGA arm64=m
+
+#-
+#- *** FILE: drivers/media/platform/rockchip/rkisp1/Kconfig ***
+#-
+VIDEO_ROCKCHIP_ISP1 arm64=m
+
+#-
+#- *** FILE: drivers/media/platform/st/sti/c8sectpfe/Kconfig ***

 #-
 DVB_C8SECTPFE arm=m
 
 #-
 DVB_C8SECTPFE arm=m
 

+#-
+#- *** FILE: drivers/media/platform/via/Kconfig ***
+#-
+#- VIA media platform drivers
+VIDEO_VIA_CAMERA all=m
+

 #-
 #- *** FILE: drivers/media/platform/xilinx/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/media/platform/xilinx/Kconfig ***
 #-

+#- Xilinx media platform drivers

 VIDEO_XILINX arm=m arm64=m
 VIDEO_XILINX_CSI2RXSS arm=m arm64=m
 VIDEO_XILINX_TPG arm=m arm64=m
 VIDEO_XILINX arm=m arm64=m
 VIDEO_XILINX_CSI2RXSS arm=m arm64=m
 VIDEO_XILINX_TPG arm=m arm64=m


@@ -5023,31 +5113,31 @@ VIDEO_XILINX_VTC arm=m arm64=m
 #- *** FILE: drivers/media/radio/Kconfig ***
 #-
 RADIO_ADAPTERS all=y
 #- *** FILE: drivers/media/radio/Kconfig ***
 #-
 RADIO_ADAPTERS all=y

-#- file drivers/media/radio/si470x/Kconfig goes here
-RADIO_SI4713 all=m
-#- file drivers/media/radio/si4713/Kconfig goes here
-RADIO_SI476X all=m
-USB_MR800 all=m
-USB_DSBR all=m

 RADIO_MAXIRADIO all=m
 RADIO_MAXIRADIO all=m

+RADIO_SAA7706H all=m

 RADIO_SHARK all=m
 RADIO_SHARK2 all=m
 RADIO_SHARK all=m
 RADIO_SHARK2 all=m

-USB_KEENE all=m
-USB_RAREMONO all=m
-USB_MA901 all=m
+RADIO_SI4713 all=m
+RADIO_SI476X all=m

 RADIO_TEA5764 all=m
 RADIO_TEA5764 all=m

-RADIO_SAA7706H all=m

 RADIO_TEF6862 all=m
 RADIO_TIMBERDALE all=m
 RADIO_WL1273 all=m
 RADIO_TEF6862 all=m
 RADIO_TIMBERDALE all=m
 RADIO_WL1273 all=m

+USB_DSBR all=m
+USB_KEENE all=m
+USB_MA901 all=m
+USB_MR800 all=m
+USB_RAREMONO all=m
+#- file drivers/media/radio/si470x/Kconfig goes here
+#- file drivers/media/radio/si4713/Kconfig goes here

 #- file drivers/media/radio/wl128x/Kconfig goes here
 V4L_RADIO_ISA_DRIVERS all=y
 #- file drivers/media/radio/wl128x/Kconfig goes here
 V4L_RADIO_ISA_DRIVERS all=y

-RADIO_CADET alpha=m i386=m
-RADIO_RTRACK alpha=m i386=m
-RADIO_RTRACK2 alpha=m i386=m

 RADIO_AZTECH alpha=m i386=m
 RADIO_AZTECH alpha=m i386=m

+RADIO_CADET alpha=m i386=m

 RADIO_GEMTEK alpha=m i386=m
 RADIO_MIROPCM20 all=m
 RADIO_GEMTEK alpha=m i386=m
 RADIO_MIROPCM20 all=m

+RADIO_RTRACK alpha=m i386=m
+RADIO_RTRACK2 alpha=m i386=m

 RADIO_SF16FMI alpha=m i386=m
 RADIO_SF16FMR2 alpha=m i386=m
 RADIO_TERRATEC alpha=m i386=m
 RADIO_SF16FMI alpha=m i386=m
 RADIO_SF16FMR2 alpha=m i386=m
 RADIO_TERRATEC alpha=m i386=m


@@ -5078,48 +5168,48 @@ RADIO_WL128X all=m
 #- *** FILE: drivers/media/rc/Kconfig ***
 #-
 RC_CORE all=m
 #- *** FILE: drivers/media/rc/Kconfig ***
 #-
 RC_CORE all=m

-#- file drivers/media/rc/keymaps/Kconfig goes here

 LIRC all=y
 LIRC all=y

+#- file drivers/media/rc/keymaps/Kconfig goes here

 RC_DECODERS all=y
 RC_DECODERS all=y

+IR_IMON_DECODER all=m
+IR_JVC_DECODER all=m
+IR_MCE_KBD_DECODER all=m

 IR_NEC_DECODER all=m
 IR_RC5_DECODER all=m
 IR_RC6_DECODER all=m
 IR_NEC_DECODER all=m
 IR_RC5_DECODER all=m
 IR_RC6_DECODER all=m

-IR_JVC_DECODER all=m
-IR_SONY_DECODER all=m
+IR_RCMM_DECODER all=m

 IR_SANYO_DECODER all=m
 IR_SHARP_DECODER all=m
 IR_SANYO_DECODER all=m
 IR_SHARP_DECODER all=m

-IR_MCE_KBD_DECODER all=m
+IR_SONY_DECODER all=m

 IR_XMP_DECODER all=m
 IR_XMP_DECODER all=m

-IR_IMON_DECODER all=m
-IR_RCMM_DECODER all=m

 RC_DEVICES all=y
 RC_DEVICES all=y

-RC_ATI_REMOTE all=m

 IR_ENE all=m
 IR_ENE all=m

+IR_FINTEK all=m
+IR_GPIO_CIR all=m
+IR_GPIO_TX all=m

 IR_HIX5HD2 all=m
 IR_HIX5HD2 all=m

+IR_IGORPLUGUSB all=m
+IR_IGUANA all=m

 IR_IMON all=m
 IR_IMON_RAW all=m
 IR_IMON all=m
 IR_IMON_RAW all=m

-IR_MCEUSB all=m

 IR_ITE_CIR all=m
 IR_ITE_CIR all=m

-IR_FINTEK all=m
+IR_MCEUSB all=m

 IR_MESON arm64=m
 IR_MESON_TX arm64=m
 IR_NUVOTON all=m
 IR_MESON arm64=m
 IR_MESON_TX arm64=m
 IR_NUVOTON all=m

+IR_PWM_TX all=m

 IR_REDRAT3 all=m
 IR_REDRAT3 all=m

+IR_SERIAL all=m
+IR_SERIAL_TRANSMITTER all=y

 IR_SPI all=m
 IR_STREAMZAP all=m
 IR_SPI all=m
 IR_STREAMZAP all=m

-IR_WINBOND_CIR all=m
-IR_IGORPLUGUSB all=m
-IR_IGUANA all=m
+IR_TOY all=m

 IR_TTUSBIR all=m
 IR_TTUSBIR all=m

-#- file drivers/media/rc/img-ir/Kconfig goes here
+IR_WINBOND_CIR all=m
+RC_ATI_REMOTE all=m

 RC_LOOPBACK all=m
 RC_LOOPBACK all=m

-IR_GPIO_CIR all=m
-IR_GPIO_TX all=m
-IR_PWM_TX all=m
-IR_SERIAL all=m
-IR_SERIAL_TRANSMITTER all=y

 RC_XBOX_DVD all=m
 RC_XBOX_DVD all=m

-IR_TOY all=m
+#- file drivers/media/rc/img-ir/Kconfig goes here

 
 #-
 #- *** FILE: drivers/media/rc/img-ir/Kconfig ***
 
 #-
 #- *** FILE: drivers/media/rc/img-ir/Kconfig ***


@@ -5143,53 +5233,54 @@ RC_MAP all=m
 #-
 #- SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'
 CXD2880_SPI_DRV all=m
 #-
 #- SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'
 CXD2880_SPI_DRV all=m

+VIDEO_GS1662 all=m

 
 #-
 #- *** FILE: drivers/media/test-drivers/Kconfig ***
 #-
 V4L_TEST_DRIVERS all=n
 
 #-
 #- *** FILE: drivers/media/test-drivers/Kconfig ***
 #-
 V4L_TEST_DRIVERS all=n

+#- file drivers/media/test-drivers/vicodec/Kconfig goes here

 #- file drivers/media/test-drivers/vimc/Kconfig goes here
 #- file drivers/media/test-drivers/vivid/Kconfig goes here
 #- 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/test-drivers/vidtv/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/tuners/Kconfig ***
 #-
 #- Tuner drivers auto-selected by 'Autoselect ancillary drivers'
 #- file drivers/media/test-drivers/vidtv/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/tuners/Kconfig ***
 #-
 #- Tuner drivers auto-selected by 'Autoselect ancillary drivers'

-MEDIA_TUNER_TDA18212 all=m

 MEDIA_TUNER_M88RS6000T all=m
 MEDIA_TUNER_M88RS6000T all=m

+MEDIA_TUNER_TDA18212 all=m

 
 #-
 #- *** FILE: drivers/media/usb/Kconfig ***
 #-
 MEDIA_USB_SUPPORT all=y
 #- Webcam devices
 
 #-
 #- *** FILE: drivers/media/usb/Kconfig ***
 #-
 MEDIA_USB_SUPPORT all=y
 #- Webcam devices

-#- file drivers/media/usb/uvc/Kconfig goes here
+#- file drivers/media/usb/cpia2/Kconfig goes here

 #- file drivers/media/usb/gspca/Kconfig goes here
 #- file drivers/media/usb/pwc/Kconfig goes here
 #- file drivers/media/usb/gspca/Kconfig goes here
 #- file drivers/media/usb/pwc/Kconfig goes here

-#- file drivers/media/usb/cpia2/Kconfig goes here
-#- file drivers/media/usb/zr364xx/Kconfig goes here
-#- file drivers/media/usb/stkwebcam/Kconfig goes here

 #- file drivers/media/usb/s2255/Kconfig goes here
 #- file drivers/media/usb/s2255/Kconfig goes here

+#- file drivers/media/usb/stkwebcam/Kconfig goes here

 #- file drivers/media/usb/usbtv/Kconfig goes here
 #- file drivers/media/usb/usbtv/Kconfig goes here

+#- file drivers/media/usb/uvc/Kconfig goes here
+#- file drivers/media/usb/zr364xx/Kconfig goes here

 #- Analog TV USB devices
 #- Analog TV USB devices

-#- file drivers/media/usb/pvrusb2/Kconfig goes here
+#- file drivers/media/usb/go7007/Kconfig goes here

 #- file drivers/media/usb/hdpvr/Kconfig goes here
 #- file drivers/media/usb/hdpvr/Kconfig goes here

+#- file drivers/media/usb/pvrusb2/Kconfig goes here

 #- file drivers/media/usb/stk1160/Kconfig goes here
 #- file drivers/media/usb/stk1160/Kconfig goes here

-#- file drivers/media/usb/go7007/Kconfig goes here

 #- Analog/digital TV USB devices
 #- file drivers/media/usb/au0828/Kconfig goes here
 #- file drivers/media/usb/cx231xx/Kconfig goes here
 #- file drivers/media/usb/tm6000/Kconfig goes here
 #- Digital TV USB devices
 #- Analog/digital TV USB devices
 #- file drivers/media/usb/au0828/Kconfig goes here
 #- file drivers/media/usb/cx231xx/Kconfig goes here
 #- file drivers/media/usb/tm6000/Kconfig goes here
 #- Digital TV USB devices

-#- file drivers/media/usb/dvb-usb/Kconfig goes here
+#- file drivers/media/usb/as102/Kconfig goes here
+#- file drivers/media/usb/b2c2/Kconfig goes here

 #- file drivers/media/usb/dvb-usb-v2/Kconfig goes here
 #- file drivers/media/usb/dvb-usb-v2/Kconfig goes here

+#- file drivers/media/usb/dvb-usb/Kconfig goes here
+#- file drivers/media/usb/siano/Kconfig goes here

 #- file drivers/media/usb/ttusb-budget/Kconfig goes here
 #- file drivers/media/usb/ttusb-dec/Kconfig goes here
 #- file drivers/media/usb/ttusb-budget/Kconfig goes here
 #- file drivers/media/usb/ttusb-dec/Kconfig goes here

-#- file drivers/media/usb/siano/Kconfig goes here
-#- file drivers/media/usb/b2c2/Kconfig goes here
-#- file drivers/media/usb/as102/Kconfig goes here

 #- Webcam, TV (analog/digital) USB devices
 #- file drivers/media/usb/em28xx/Kconfig goes here
 #- Software defined radio USB devices
 #- Webcam, TV (analog/digital) USB devices
 #- file drivers/media/usb/em28xx/Kconfig goes here
 #- Software defined radio USB devices


@@ -5243,12 +5334,12 @@ DVB_USB_ANYSEE all=m
 DVB_USB_AU6610 all=m
 DVB_USB_AZ6007 all=m
 DVB_USB_CE6230 all=m
 DVB_USB_AU6610 all=m
 DVB_USB_AZ6007 all=m
 DVB_USB_CE6230 all=m

+DVB_USB_DVBSKY all=m

 DVB_USB_EC168 all=m
 DVB_USB_GL861 all=m
 DVB_USB_LME2510 all=m
 DVB_USB_MXL111SF all=m
 DVB_USB_RTL28XXU all=m
 DVB_USB_EC168 all=m
 DVB_USB_GL861 all=m
 DVB_USB_LME2510 all=m
 DVB_USB_MXL111SF all=m
 DVB_USB_RTL28XXU all=m

-DVB_USB_DVBSKY all=m

 DVB_USB_ZD1301 all=m
 
 #-
 DVB_USB_ZD1301 all=m
 
 #-


@@ -5257,30 +5348,30 @@ DVB_USB_ZD1301 all=m
 DVB_USB all=m
 DVB_USB_DEBUG all=n
 DVB_USB_A800 all=m
 DVB_USB all=m
 DVB_USB_DEBUG all=n
 DVB_USB_A800 all=m

+DVB_USB_AF9005 all=m
+DVB_USB_AF9005_REMOTE all=m
+DVB_USB_AZ6027 all=m
+DVB_USB_CINERGY_T2 all=m
+DVB_USB_CXUSB all=m
+DVB_USB_CXUSB_ANALOG all=y
+DVB_USB_DIB0700 all=m

 DVB_USB_DIBUSB_MB all=m
 DVB_USB_DIBUSB_MB_FAULTY all=n
 DVB_USB_DIBUSB_MC all=m
 DVB_USB_DIBUSB_MB all=m
 DVB_USB_DIBUSB_MB_FAULTY all=n
 DVB_USB_DIBUSB_MC all=m

-DVB_USB_DIB0700 all=m
-DVB_USB_UMT_010 all=m
-DVB_USB_CXUSB all=m
-DVB_USB_CXUSB_ANALOG all=y
-DVB_USB_M920X all=m

 DVB_USB_DIGITV all=m
 DVB_USB_DIGITV all=m

-DVB_USB_VP7045 all=m
-DVB_USB_VP702X all=m
+DVB_USB_DTT200U all=m
+DVB_USB_DTV5100 all=m
+DVB_USB_DW2102 all=m

 DVB_USB_GP8PSK all=m
 DVB_USB_GP8PSK all=m

+DVB_USB_M920X all=m

 DVB_USB_NOVA_T_USB2 all=m
 DVB_USB_NOVA_T_USB2 all=m

-DVB_USB_TTUSB2 all=m
-DVB_USB_DTT200U all=m

 DVB_USB_OPERA1 all=m
 DVB_USB_OPERA1 all=m

-DVB_USB_AF9005 all=m
-DVB_USB_AF9005_REMOTE all=m

 DVB_USB_PCTV452E all=m
 DVB_USB_PCTV452E all=m

-DVB_USB_DW2102 all=m
-DVB_USB_CINERGY_T2 all=m
-DVB_USB_DTV5100 all=m
-DVB_USB_AZ6027 all=m

 DVB_USB_TECHNISAT_USB2 all=m
 DVB_USB_TECHNISAT_USB2 all=m

+DVB_USB_TTUSB2 all=m
+DVB_USB_UMT_010 all=m
+DVB_USB_VP702X all=m
+DVB_USB_VP7045 all=m

 
 #-
 #- *** FILE: drivers/media/usb/em28xx/Kconfig ***
 
 #-
 #- *** FILE: drivers/media/usb/em28xx/Kconfig ***


@@ -5303,9 +5394,6 @@ VIDEO_GO7007_USB_S2250_BOARD all=m
 #- *** FILE: drivers/media/usb/gspca/Kconfig ***
 #-
 USB_GSPCA all=m
 #- *** FILE: drivers/media/usb/gspca/Kconfig ***
 #-
 USB_GSPCA all=m

-#- file drivers/media/usb/gspca/m5602/Kconfig goes here
-#- file drivers/media/usb/gspca/stv06xx/Kconfig goes here
-#- file drivers/media/usb/gspca/gl860/Kconfig goes here

 USB_GSPCA_BENQ all=m
 USB_GSPCA_CONEX all=m
 USB_GSPCA_CPIA1 all=m
 USB_GSPCA_BENQ all=m
 USB_GSPCA_CONEX all=m
 USB_GSPCA_CPIA1 all=m


@@ -5330,13 +5418,13 @@ USB_GSPCA_SN9C2028 all=m
 USB_GSPCA_SN9C20X all=m
 USB_GSPCA_SONIXB all=m
 USB_GSPCA_SONIXJ all=m
 USB_GSPCA_SN9C20X all=m
 USB_GSPCA_SONIXB all=m
 USB_GSPCA_SONIXJ all=m

+USB_GSPCA_SPCA1528 all=m

 USB_GSPCA_SPCA500 all=m
 USB_GSPCA_SPCA501 all=m
 USB_GSPCA_SPCA505 all=m
 USB_GSPCA_SPCA506 all=m
 USB_GSPCA_SPCA508 all=m
 USB_GSPCA_SPCA561 all=m
 USB_GSPCA_SPCA500 all=m
 USB_GSPCA_SPCA501 all=m
 USB_GSPCA_SPCA505 all=m
 USB_GSPCA_SPCA506 all=m
 USB_GSPCA_SPCA508 all=m
 USB_GSPCA_SPCA561 all=m

-USB_GSPCA_SPCA1528 all=m

 USB_GSPCA_SQ905 all=m
 USB_GSPCA_SQ905C all=m
 USB_GSPCA_SQ930X all=m
 USB_GSPCA_SQ905 all=m
 USB_GSPCA_SQ905C all=m
 USB_GSPCA_SQ930X all=m


@@ -5352,6 +5440,9 @@ USB_GSPCA_VC032X all=m
 USB_GSPCA_VICAM all=m
 USB_GSPCA_XIRLINK_CIT all=m
 USB_GSPCA_ZC3XX all=m
 USB_GSPCA_VICAM all=m
 USB_GSPCA_XIRLINK_CIT all=m
 USB_GSPCA_ZC3XX all=m

+#- file drivers/media/usb/gspca/gl860/Kconfig goes here
+#- file drivers/media/usb/gspca/m5602/Kconfig goes here
+#- file drivers/media/usb/gspca/stv06xx/Kconfig goes here

 
 #-
 #- *** FILE: drivers/media/usb/gspca/gl860/Kconfig ***
 
 #-
 #- *** FILE: drivers/media/usb/gspca/gl860/Kconfig ***


@@ -5455,7 +5546,6 @@ USB_ZR364XX all=m
 #-
 #- *** FILE: drivers/media/v4l2-core/Kconfig ***
 #-
 #-
 #- *** 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_V4L2_SUBDEV_API all=y
 VIDEO_ADV_DEBUG all=n
 VIDEO_FIXED_MINOR_RANGES all=n


@@ -5587,13 +5677,13 @@ MFD_RT5033 all=m
 MFD_RK808 arm=m arm64=m
 MFD_RN5T618 all=m
 MFD_SI476X_CORE all=m
 MFD_RK808 arm=m arm64=m
 MFD_RN5T618 all=m
 MFD_SI476X_CORE all=m

+MFD_SIMPLE_MFD_I2C all=m

 MFD_SL28CPLD all=m
 MFD_SM501 all=m
 MFD_SM501_GPIO all=y
 MFD_SKY81452 all=m
 ABX500_CORE all=y
 AB8500_CORE all=y
 MFD_SL28CPLD all=m
 MFD_SM501 all=m
 MFD_SM501_GPIO all=y
 MFD_SKY81452 all=m
 ABX500_CORE all=y
 AB8500_CORE all=y

-AB8500_DEBUG all=n

 MFD_STMPE all=y
 STMPE_SPI all=y
 MFD_SYSCON all=y
 MFD_STMPE all=y
 STMPE_SPI all=y
 MFD_SYSCON all=y


@@ -6022,6 +6112,7 @@ MTD_PLATRAM all=m
 #- file drivers/mtd/nand/spi/Kconfig goes here
 MTD_NAND_ECC_SW_HAMMING_SMC all=y
 MTD_NAND_ECC_SW_BCH all=y
 #- file drivers/mtd/nand/spi/Kconfig goes here
 MTD_NAND_ECC_SW_HAMMING_SMC all=y
 MTD_NAND_ECC_SW_BCH all=y

+MTD_NAND_ECC_MXIC all=y

 
 #-
 #- *** FILE: drivers/mtd/nand/onenand/Kconfig ***
 
 #-
 #- *** FILE: drivers/mtd/nand/onenand/Kconfig ***


@@ -6095,12 +6186,6 @@ MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE all=y
 MTD_SPI_NOR_SWP_KEEP all=n
 #- file drivers/mtd/spi-nor/controllers/Kconfig goes here
 
 MTD_SPI_NOR_SWP_KEEP all=n
 #- file drivers/mtd/spi-nor/controllers/Kconfig goes here
 

-#-
-#- *** FILE: drivers/mtd/spi-nor/controllers/Kconfig ***
-#-
-SPI_INTEL_SPI_PCI all=m
-SPI_INTEL_SPI_PLATFORM all=m
-

 #-
 #- *** FILE: drivers/mtd/ubi/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/mtd/ubi/Kconfig ***
 #-


@@ -6408,6 +6493,8 @@ NET_DSA_AR9331 all=m
 #-
 NET_DSA_REALTEK all=m
 NET_DSA_REALTEK_SMI all=m
 #-
 NET_DSA_REALTEK all=m
 NET_DSA_REALTEK_SMI all=m

+NET_DSA_REALTEK_RTL8365MB all=m
+NET_DSA_REALTEK_RTL8366RB all=m

 
 #-
 #- *** FILE: drivers/net/dsa/sja1105/Kconfig ***
 
 #-
 #- *** FILE: drivers/net/dsa/sja1105/Kconfig ***


@@ -6487,6 +6574,7 @@ DNET all=m
 #- file drivers/net/ethernet/faraday/Kconfig goes here
 #- file drivers/net/ethernet/freescale/Kconfig goes here
 #- file drivers/net/ethernet/fujitsu/Kconfig goes here
 #- file drivers/net/ethernet/faraday/Kconfig goes here
 #- file drivers/net/ethernet/freescale/Kconfig goes here
 #- file drivers/net/ethernet/fujitsu/Kconfig goes here

+#- file drivers/net/ethernet/fungible/Kconfig goes here

 #- file drivers/net/ethernet/google/Kconfig goes here
 #- file drivers/net/ethernet/hisilicon/Kconfig goes here
 #- file drivers/net/ethernet/huawei/Kconfig goes here
 #- file drivers/net/ethernet/google/Kconfig goes here
 #- file drivers/net/ethernet/hisilicon/Kconfig goes here
 #- file drivers/net/ethernet/huawei/Kconfig goes here


@@ -6740,8 +6828,10 @@ GEMINI_ETHERNET arm=m arm64=m
 #-
 #- *** FILE: drivers/net/ethernet/davicom/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/net/ethernet/davicom/Kconfig ***
 #-

+NET_VENDOR_DAVICOM all=y

 DM9000 arm=m
 DM9000_FORCE_SIMPLE_PHY_POLL arm=n
 DM9000 arm=m
 DM9000_FORCE_SIMPLE_PHY_POLL arm=n

+DM9051 all=m

 
 #-
 #- *** FILE: drivers/net/ethernet/dec/Kconfig ***
 
 #-
 #- *** FILE: drivers/net/ethernet/dec/Kconfig ***


@@ -6829,6 +6919,17 @@ GIANFAR ppc=m
 NET_VENDOR_FUJITSU all=y
 PCMCIA_FMVJ18X all=m
 
 NET_VENDOR_FUJITSU all=y
 PCMCIA_FMVJ18X all=m
 

+#-
+#- *** FILE: drivers/net/ethernet/fungible/Kconfig ***
+#-
+NET_VENDOR_FUNGIBLE all=y
+#- file drivers/net/ethernet/fungible/funeth/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/ethernet/fungible/funeth/Kconfig ***
+#-
+FUN_ETH all=m
+

 #-
 #- *** FILE: drivers/net/ethernet/google/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/net/ethernet/google/Kconfig ***
 #-


@@ -7385,6 +7486,7 @@ IEEE802154_HWSIM all=m
 #- *** FILE: drivers/net/mctp/Kconfig ***
 #-
 MCTP_SERIAL all=m
 #- *** FILE: drivers/net/mctp/Kconfig ***
 #-
 MCTP_SERIAL all=m

+MCTP_TRANSPORT_I2C all=m

 
 #-
 #- *** FILE: drivers/net/mdio/Kconfig ***
 
 #-
 #- *** FILE: drivers/net/mdio/Kconfig ***


@@ -7935,6 +8037,7 @@ MT7915E all=m
 #-
 MT7921E all=m
 MT7921S all=m
 #-
 MT7921E all=m
 MT7921S all=m

+MT7921U all=m

 
 #-
 #- *** FILE: drivers/net/wireless/mediatek/mt7601u/Kconfig ***
 
 #-
 #- *** FILE: drivers/net/wireless/mediatek/mt7601u/Kconfig ***


@@ -8265,7 +8368,6 @@ NTB_MSI_TEST all=m
 #-
 LIBNVDIMM arm64=m
 BLK_DEV_PMEM all=m
 #-
 LIBNVDIMM arm64=m
 BLK_DEV_PMEM all=m

-ND_BLK all=m

 BTT all=y
 NVDIMM_PFN all=y
 NVDIMM_DAX all=y
 BTT all=y
 NVDIMM_PFN all=y
 NVDIMM_DAX all=y


@@ -8277,6 +8379,7 @@ OF_PMEM arm64=m
 NVME_CORE all=m
 BLK_DEV_NVME all=m
 NVME_MULTIPATH all=y
 NVME_CORE all=m
 BLK_DEV_NVME all=m
 NVME_MULTIPATH all=y

+NVME_VERBOSE_ERRORS all=y

 NVME_HWMON all=y
 NVME_RDMA all=m
 NVME_FC all=m
 NVME_HWMON all=y
 NVME_RDMA all=m
 NVME_FC all=m


@@ -8346,6 +8449,8 @@ PCI_PASID all=y
 PCI_P2PDMA all=y
 PCI_LABEL all=y
 PCI_HYPERV all=m
 PCI_P2PDMA all=y
 PCI_LABEL all=y
 PCI_HYPERV all=m

+VGA_ARB all=y
+VGA_ARB_MAX_GPUS all=16

 #- file drivers/pci/hotplug/Kconfig goes here
 #- file drivers/pci/controller/Kconfig goes here
 #- file drivers/pci/endpoint/Kconfig goes here
 #- file drivers/pci/hotplug/Kconfig goes here
 #- file drivers/pci/controller/Kconfig goes here
 #- file drivers/pci/endpoint/Kconfig goes here


@@ -8478,6 +8583,13 @@ PCMCIA_PROBE alpha=y i386=y
 ELECTRA_CF ppc64=m
 PCCARD_NONSTATIC all=y
 
 ELECTRA_CF ppc64=m
 PCCARD_NONSTATIC all=y
 

+#-
+#- *** FILE: drivers/peci/Kconfig ***
+#-
+PECI all=m
+PECI_CPU all=m
+#- file drivers/peci/controller/Kconfig goes here
+

 #-
 #- *** FILE: drivers/perf/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/perf/Kconfig ***
 #-


@@ -8667,6 +8779,7 @@ PINCTRL_STMFX arm=m arm64=m
 #- file drivers/pinctrl/spear/Kconfig goes here
 #- file drivers/pinctrl/sprd/Kconfig goes here
 #- file drivers/pinctrl/stm32/Kconfig goes here
 #- file drivers/pinctrl/spear/Kconfig goes here
 #- file drivers/pinctrl/sprd/Kconfig goes here
 #- file drivers/pinctrl/stm32/Kconfig goes here

+#- file drivers/pinctrl/sunplus/Kconfig goes here

 #- file drivers/pinctrl/sunxi/Kconfig goes here
 #- file drivers/pinctrl/tegra/Kconfig goes here
 #- file drivers/pinctrl/ti/Kconfig goes here
 #- file drivers/pinctrl/sunxi/Kconfig goes here
 #- file drivers/pinctrl/tegra/Kconfig goes here
 #- file drivers/pinctrl/ti/Kconfig goes here


@@ -8733,6 +8846,7 @@ CROS_EC_SYSFS all=m
 CROS_EC_TYPEC all=m
 CROS_USBPD_LOGGER all=m
 CROS_USBPD_NOTIFY all=m
 CROS_EC_TYPEC all=m
 CROS_USBPD_LOGGER all=m
 CROS_USBPD_NOTIFY all=m

+CHROMEOS_PRIVACY_SCREEN all=m

 #- file drivers/platform/chrome/wilco_ec/Kconfig goes here
 
 #-
 #- file drivers/platform/chrome/wilco_ec/Kconfig goes here
 
 #-


@@ -8765,7 +8879,6 @@ MLXBF_PMC arm64=m
 #-
 SURFACE_PLATFORMS all=y
 SURFACE3_WMI all=m
 #-
 SURFACE_PLATFORMS all=y
 SURFACE3_WMI all=m

-SURFACE_3_BUTTON all=m

 SURFACE_3_POWER_OPREGION all=m
 SURFACE_ACPI_NOTIFY all=m
 SURFACE_AGGREGATOR_CDEV all=m
 SURFACE_3_POWER_OPREGION all=m
 SURFACE_ACPI_NOTIFY all=m
 SURFACE_AGGREGATOR_CDEV all=m


@@ -8801,6 +8914,7 @@ ACERHDF all=m
 ACER_WIRELESS all=m
 ACER_WMI all=m
 AMD_PMC all=m
 ACER_WIRELESS all=m
 ACER_WMI all=m
 AMD_PMC all=m

+AMD_HSMP all=m

 ADV_SWBUTTON all=m
 APPLE_GMUX all=m
 ASUS_LAPTOP i386=m x86_64=m
 ADV_SWBUTTON all=m
 APPLE_GMUX all=m
 ASUS_LAPTOP i386=m x86_64=m


@@ -8851,7 +8965,7 @@ SONY_LAPTOP i386=m x86_64=m
 SONYPI_COMPAT i386=y x86_64=y
 SYSTEM76_ACPI all=m
 TOPSTAR_LAPTOP all=m
 SONYPI_COMPAT i386=y x86_64=y
 SYSTEM76_ACPI all=m
 TOPSTAR_LAPTOP all=m

-I2C_MULTI_INSTANTIATE all=m
+SERIAL_MULTI_INSTANTIATE all=m

 MLX_PLATFORM all=m
 X86_ANDROID_TABLETS all=m
 INTEL_IPS all=m
 MLX_PLATFORM all=m
 X86_ANDROID_TABLETS all=m
 INTEL_IPS all=m


@@ -8885,26 +8999,27 @@ DELL_WMI_SYSMAN all=m
 #-
 #- file drivers/platform/x86/intel/atomisp2/Kconfig goes here
 #- file drivers/platform/x86/intel/int1092/Kconfig goes here
 #-
 #- file drivers/platform/x86/intel/atomisp2/Kconfig goes here
 #- file drivers/platform/x86/intel/int1092/Kconfig goes here

-#- file drivers/platform/x86/intel/int33fe/Kconfig goes here

 #- file drivers/platform/x86/intel/int3472/Kconfig goes here
 #- file drivers/platform/x86/intel/pmc/Kconfig goes here
 #- file drivers/platform/x86/intel/pmt/Kconfig goes here
 #- file drivers/platform/x86/intel/speed_select_if/Kconfig goes here
 #- file drivers/platform/x86/intel/telemetry/Kconfig goes here
 #- file drivers/platform/x86/intel/wmi/Kconfig goes here
 #- file drivers/platform/x86/intel/int3472/Kconfig goes here
 #- file drivers/platform/x86/intel/pmc/Kconfig goes here
 #- file drivers/platform/x86/intel/pmt/Kconfig goes here
 #- file drivers/platform/x86/intel/speed_select_if/Kconfig goes here
 #- file drivers/platform/x86/intel/telemetry/Kconfig goes here
 #- file drivers/platform/x86/intel/wmi/Kconfig goes here

+#- file drivers/platform/x86/intel/uncore-frequency/Kconfig goes here

 INTEL_HID_EVENT all=m
 INTEL_VBTN all=m
 INTEL_INT0002_VGPIO all=m
 INTEL_OAKTRAIL all=m
 INTEL_BXTWC_PMIC_TMU all=m
 INTEL_CHTDC_TI_PWRBTN all=m
 INTEL_HID_EVENT all=m
 INTEL_VBTN all=m
 INTEL_INT0002_VGPIO all=m
 INTEL_OAKTRAIL all=m
 INTEL_BXTWC_PMIC_TMU all=m
 INTEL_CHTDC_TI_PWRBTN all=m

+INTEL_CHTWC_INT33FE all=m

 INTEL_ISHTP_ECLITE all=m
 INTEL_MRFLD_PWRBTN all=m
 INTEL_PUNIT_IPC all=m
 INTEL_RST all=m
 INTEL_ISHTP_ECLITE all=m
 INTEL_MRFLD_PWRBTN all=m
 INTEL_PUNIT_IPC all=m
 INTEL_RST all=m

+INTEL_SDSI all=m

 INTEL_SMARTCONNECT all=m
 INTEL_TURBO_MAX_3 all=y
 INTEL_SMARTCONNECT all=m
 INTEL_TURBO_MAX_3 all=y

-INTEL_UNCORE_FREQ_CONTROL all=m

 INTEL_VSEC all=m
 
 #-
 INTEL_VSEC all=m
 
 #-


@@ -8918,11 +9033,6 @@ INTEL_ATOMISP2_PM all=m
 #-
 INTEL_SAR_INT1092 all=m
 
 #-
 INTEL_SAR_INT1092 all=m
 

-#-
-#- *** FILE: drivers/platform/x86/intel/int33fe/Kconfig ***
-#-
-INTEL_CHT_INT33FE all=m
-

 #-
 #- *** FILE: drivers/platform/x86/intel/int3472/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/platform/x86/intel/int3472/Kconfig ***
 #-


@@ -8950,6 +9060,11 @@ INTEL_SPEED_SELECT_INTERFACE all=m
 #-
 INTEL_TELEMETRY all=m
 
 #-
 INTEL_TELEMETRY all=m
 

+#-
+#- *** FILE: drivers/platform/x86/intel/uncore-frequency/Kconfig ***
+#-
+INTEL_UNCORE_FREQ_CONTROL all=m
+

 #-
 #- *** FILE: drivers/platform/x86/intel/wmi/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/platform/x86/intel/wmi/Kconfig ***
 #-


@@ -9015,6 +9130,7 @@ POWER_SUPPLY_DEBUG all=n
 PDA_POWER all=m
 APM_POWER arm=m ppc=m
 GENERIC_ADC_BATTERY all=m
 PDA_POWER all=m
 APM_POWER arm=m ppc=m
 GENERIC_ADC_BATTERY all=m

+IP5XXX_POWER all=m

 WM831X_BACKUP all=m
 WM831X_POWER all=m
 WM8350_POWER all=m
 WM831X_BACKUP all=m
 WM831X_POWER all=m
 WM8350_POWER all=m


@@ -9029,6 +9145,7 @@ BATTERY_DS2781 all=m
 BATTERY_DS2782 all=m
 BATTERY_LEGO_EV3 arm=m arm64=m
 BATTERY_PMU ppc=m
 BATTERY_DS2782 all=m
 BATTERY_LEGO_EV3 arm=m arm64=m
 BATTERY_PMU ppc=m

+BATTERY_SAMSUNG_SDI all=y

 BATTERY_SBS all=m
 CHARGER_SBS all=m
 MANAGER_SBS all=m
 BATTERY_SBS all=m
 CHARGER_SBS all=m
 MANAGER_SBS all=m


@@ -9086,6 +9203,7 @@ CHARGER_WILCO all=m
 RN5T618_POWER arm=m arm64=m
 BATTERY_SURFACE all=m
 CHARGER_SURFACE all=m
 RN5T618_POWER arm=m arm64=m
 BATTERY_SURFACE all=m
 CHARGER_SURFACE all=m

+BATTERY_UG3105 all=m

 
 #-
 #- *** FILE: drivers/powercap/Kconfig ***
 
 #-
 #- *** FILE: drivers/powercap/Kconfig ***


@@ -9267,6 +9385,7 @@ REGULATOR_RN5T618 all=m
 REGULATOR_RT4801 all=m
 REGULATOR_RT4831=m
 REGULATOR_RT5033 all=m
 REGULATOR_RT4801 all=m
 REGULATOR_RT4831=m
 REGULATOR_RT5033 all=m

+REGULATOR_RT5190A all=m

 REGULATOR_RT6160=m
 REGULATOR_RT6245=m
 REGULATOR_RTQ2134 all=m
 REGULATOR_RT6160=m
 REGULATOR_RT6245=m
 REGULATOR_RTQ2134 all=m


@@ -9274,6 +9393,7 @@ REGULATOR_RTMV20 all=m
 REGULATOR_RTQ6752 all=m
 REGULATOR_SKY81452 all=m
 REGULATOR_SLG51000 all=m
 REGULATOR_RTQ6752 all=m
 REGULATOR_SKY81452 all=m
 REGULATOR_SLG51000 all=m

+REGULATOR_SY7636A all=m

 REGULATOR_SY8106A arm=m arm64=m
 REGULATOR_SY8824X arm=m arm64=m
 REGULATOR_SY8827N arm=m arm64=m
 REGULATOR_SY8106A arm=m arm64=m
 REGULATOR_SY8824X arm=m arm64=m
 REGULATOR_SY8827N arm=m arm64=m


@@ -9323,6 +9443,7 @@ RESET_TI_SYSCON all=m
 #- *** FILE: drivers/rpmsg/Kconfig ***
 #-
 RPMSG_CHAR all=m
 #- *** FILE: drivers/rpmsg/Kconfig ***
 #-
 RPMSG_CHAR all=m

+RPMSG_CTRL all=m

 RPMSG_QCOM_GLINK_RPM all=m
 RPMSG_VIRTIO all=m
 
 RPMSG_QCOM_GLINK_RPM all=m
 RPMSG_VIRTIO all=m
 


@@ -9877,6 +9998,8 @@ SPI_HISI_KUNPENG arm64=m
 SPI_HISI_SFC_V3XX arm64=m
 SPI_NXP_FLEXSPI all=m
 SPI_GPIO all=m
 SPI_HISI_SFC_V3XX arm64=m
 SPI_NXP_FLEXSPI all=m
 SPI_GPIO all=m

+SPI_INTEL_PCI all=m
+SPI_INTEL_PLATFORM all=m

 SPI_LM70_LLP all=m
 SPI_MPC52xx_PSC ppc=m
 SPI_FSL_SPI arm=m arm64=m
 SPI_LM70_LLP all=m
 SPI_MPC52xx_PSC ppc=m
 SPI_FSL_SPI arm=m arm64=m


@@ -9945,11 +10068,9 @@ STAGING all=y
 #- 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/emxx_udc/Kconfig goes here
 #- file drivers/staging/nvec/Kconfig goes here
 #- file drivers/staging/media/Kconfig goes here

-#- file drivers/staging/android/Kconfig goes here

 #- file drivers/staging/board/Kconfig goes here
 #- file drivers/staging/gdm724x/Kconfig goes here
 #- file drivers/staging/fwserial/Kconfig goes here
 #- file drivers/staging/board/Kconfig goes here
 #- file drivers/staging/gdm724x/Kconfig goes here
 #- file drivers/staging/fwserial/Kconfig goes here

-#- file drivers/staging/gs_fpgaboot/Kconfig goes here

 #- file drivers/staging/unisys/Kconfig goes here
 #- file drivers/staging/clocking-wizard/Kconfig goes here
 #- file drivers/staging/fbtft/Kconfig goes here
 #- file drivers/staging/unisys/Kconfig goes here
 #- file drivers/staging/clocking-wizard/Kconfig goes here
 #- file drivers/staging/fbtft/Kconfig goes here


@@ -9958,7 +10079,6 @@ STAGING all=y
 #- file drivers/staging/greybus/Kconfig goes here
 #- file drivers/staging/vc04_services/Kconfig goes here
 #- file drivers/staging/pi433/Kconfig goes here
 #- file drivers/staging/greybus/Kconfig goes here
 #- file drivers/staging/vc04_services/Kconfig goes here
 #- file drivers/staging/pi433/Kconfig goes here

-#- file drivers/staging/mt7621-dts/Kconfig goes here

 #- file drivers/staging/axis-fifo/Kconfig goes here
 #- file drivers/staging/fieldbus/Kconfig goes here
 #- file drivers/staging/qlge/Kconfig goes here
 #- file drivers/staging/axis-fifo/Kconfig goes here
 #- file drivers/staging/fieldbus/Kconfig goes here
 #- file drivers/staging/qlge/Kconfig goes here


@@ -10063,11 +10183,6 @@ GREYBUS_SPI all=m
 GREYBUS_UART all=m
 GREYBUS_USB all=m
 
 GREYBUS_UART all=m
 GREYBUS_USB all=m
 

-#-
-#- *** FILE: drivers/staging/gs_fpgaboot/Kconfig ***
-#-
-GS_FPGABOOT all=m
-

 #-
 #- *** FILE: drivers/staging/iio/accel/Kconfig ***
 #-
 #-
 #- *** FILE: drivers/staging/iio/accel/Kconfig ***
 #-


@@ -10078,7 +10193,6 @@ ADIS16240 all=m
 #- *** FILE: drivers/staging/iio/adc/Kconfig ***
 #-
 AD7816 all=m
 #- *** FILE: drivers/staging/iio/adc/Kconfig ***
 #-
 AD7816 all=m

-AD7280 all=m

 
 #-
 #- *** FILE: drivers/staging/iio/addac/Kconfig ***
 
 #-
 #- *** FILE: drivers/staging/iio/addac/Kconfig ***


@@ -10132,7 +10246,6 @@ STAGING_MEDIA all=y
 #- 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/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/zoran/Kconfig goes here
 #- file drivers/staging/media/tegra-video/Kconfig goes here
 #- file drivers/staging/media/ipu3/Kconfig goes here
 #- file drivers/staging/media/zoran/Kconfig goes here
 #- file drivers/staging/media/tegra-video/Kconfig goes here
 #- file drivers/staging/media/ipu3/Kconfig goes here


@@ -10196,13 +10309,13 @@ VIDEO_ROCKCHIP_VDEC arm64=m
 #- *** FILE: drivers/staging/media/zoran/Kconfig ***
 #-
 VIDEO_ZORAN all=m ppc=n sparc=n
 #- *** FILE: drivers/staging/media/zoran/Kconfig ***
 #-
 VIDEO_ZORAN all=m ppc=n sparc=n

-VIDEO_ZORAN_DC30 all=m
-VIDEO_ZORAN_ZR36060 all=m
-VIDEO_ZORAN_BUZ all=m
-VIDEO_ZORAN_DC10 all=m
-VIDEO_ZORAN_LML33 all=m
-VIDEO_ZORAN_LML33R10 all=m
-VIDEO_ZORAN_AVS6EYES all=m
+VIDEO_ZORAN_DC30 all=y
+VIDEO_ZORAN_ZR36060 all=y
+VIDEO_ZORAN_BUZ all=y
+VIDEO_ZORAN_DC10 all=y
+VIDEO_ZORAN_LML33 all=y
+VIDEO_ZORAN_LML33R10 all=y
+VIDEO_ZORAN_AVS6EYES all=y

 
 #-
 #- *** FILE: drivers/staging/most/Kconfig ***
 
 #-
 #- *** FILE: drivers/staging/most/Kconfig ***


@@ -10416,7 +10529,6 @@ AMDTEE all=m
 #- *** FILE: drivers/tee/optee/Kconfig ***
 #-
 OPTEE arm=m arm64=m
 #- *** FILE: drivers/tee/optee/Kconfig ***
 #-
 OPTEE arm=m arm64=m

-OPTEE_SHM_NUM_PRIV_PAGES arm=1 arm64=1

 
 #-
 #- *** FILE: drivers/thermal/Kconfig ***
 
 #-
 #- *** FILE: drivers/thermal/Kconfig ***


@@ -10475,6 +10587,7 @@ INTEL_BXT_PMIC_THERMAL all=m
 INTEL_PCH_THERMAL all=m
 INTEL_TCC_COOLING all=m
 INTEL_MENLOW all=m
 INTEL_PCH_THERMAL all=m
 INTEL_TCC_COOLING all=m
 INTEL_MENLOW all=m

+INTEL_HFI_THERMAL all=y

 
 #-
 #- *** FILE: drivers/thermal/intel/int340x_thermal/Kconfig ***
 
 #-
 #- *** FILE: drivers/thermal/intel/int340x_thermal/Kconfig ***


@@ -11096,8 +11209,10 @@ TYPEC all=m
 #- file drivers/usb/typec/tcpm/Kconfig goes here
 #- file drivers/usb/typec/ucsi/Kconfig goes here
 #- file drivers/usb/typec/tipd/Kconfig goes here
 #- file drivers/usb/typec/tcpm/Kconfig goes here
 #- file drivers/usb/typec/ucsi/Kconfig goes here
 #- file drivers/usb/typec/tipd/Kconfig goes here

+TYPEC_RT1719 all=m

 TYPEC_HD3SS3220 all=m
 TYPEC_STUSB160X all=m
 TYPEC_HD3SS3220 all=m
 TYPEC_STUSB160X all=m

+TYPEC_WUSB3801 all=m

 #- file drivers/usb/typec/mux/Kconfig goes here
 #- file drivers/usb/typec/altmodes/Kconfig goes here
 
 #- file drivers/usb/typec/mux/Kconfig goes here
 #- file drivers/usb/typec/altmodes/Kconfig goes here
 


@@ -11183,6 +11298,13 @@ VFIO_PCI_INTX all=y
 VFIO_PCI all=m
 VFIO_PCI_VGA all=y
 VFIO_PCI_IGD all=y
 VFIO_PCI all=m
 VFIO_PCI_VGA all=y
 VFIO_PCI_IGD all=y

+#- file drivers/vfio/pci/mlx5/Kconfig goes here
+#- file drivers/vfio/pci/hisilicon/Kconfig goes here
+
+#-
+#- *** FILE: drivers/vfio/pci/mlx5/Kconfig ***
+#-
+MLX5_VFIO_PCI all=m

 
 #-
 #- *** FILE: drivers/vfio/platform/Kconfig ***
 
 #-
 #- *** FILE: drivers/vfio/platform/Kconfig ***


@@ -11433,6 +11555,7 @@ LOGO_SUN_CLUT224 sparc=y sparc64=y
 #- *** FILE: drivers/virt/Kconfig ***
 #-
 VIRT_DRIVERS all=y
 #- *** FILE: drivers/virt/Kconfig ***
 #-
 VIRT_DRIVERS all=y

+VMGENID all=y

 #- file drivers/virt/vboxguest/Kconfig goes here
 #- file drivers/virt/nitro_enclaves/Kconfig goes here
 #- file drivers/virt/acrn/Kconfig goes here
 #- file drivers/virt/vboxguest/Kconfig goes here
 #- file drivers/virt/nitro_enclaves/Kconfig goes here
 #- file drivers/virt/acrn/Kconfig goes here


@@ -11968,6 +12091,7 @@ F2FS_FS_LZ4 all=y
 F2FS_FS_LZ4HC all=y
 F2FS_FS_ZSTD all=y
 F2FS_IOSTAT all=y
 F2FS_FS_LZ4HC all=y
 F2FS_FS_ZSTD all=y
 F2FS_IOSTAT all=y

+F2FS_UNFAIR_RWSEM all=y

 
 #-
 #- *** FILE: fs/fat/Kconfig ***
 
 #-
 #- *** FILE: fs/fat/Kconfig ***


@@ -12100,7 +12224,6 @@ NFS_DISABLE_UDP_SUPPORT all=y
 #-
 NFSD all=m
 NFSD_V2_ACL all=y
 #-
 NFSD all=m
 NFSD_V2_ACL all=y

-NFSD_V3 all=y

 NFSD_V3_ACL all=y
 NFSD_V4 all=y
 NFSD_PNFS all=y
 NFSD_V3_ACL all=y
 NFSD_V4 all=y
 NFSD_PNFS all=y


@@ -12677,6 +12800,7 @@ NO_HZ_IDLE all=y
 NO_HZ_FULL all=n
 NO_HZ all=y alpha= ia64=
 HIGH_RES_TIMERS all=y alpha= ia64=
 NO_HZ_FULL all=n
 NO_HZ all=y alpha= ia64=
 HIGH_RES_TIMERS all=y alpha= ia64=

+CLOCKSOURCE_WATCHDOG_MAX_SKEW_US all=100

 
 #-
 #- *** FILE: kernel/trace/Kconfig ***
 
 #-
 #- *** FILE: kernel/trace/Kconfig ***


@@ -12687,6 +12811,7 @@ BOOTTIME_TRACING all=n
 FUNCTION_TRACER all=y
 FUNCTION_GRAPH_TRACER all=y
 DYNAMIC_FTRACE all=y
 FUNCTION_TRACER all=y
 FUNCTION_GRAPH_TRACER all=y
 DYNAMIC_FTRACE all=y

+FPROBE all=y

 FUNCTION_PROFILER all=y
 STACK_TRACER all=y
 IRQSOFF_TRACER all=n
 FUNCTION_PROFILER all=y
 STACK_TRACER all=y
 IRQSOFF_TRACER all=n


@@ -12737,6 +12862,7 @@ INDIRECT_PIO arm64=n
 CRC_CCITT all=y
 CRC16 all=m
 CRC_T10DIF all=y
 CRC_CCITT all=y
 CRC16 all=m
 CRC_T10DIF all=y

+CRC64_ROCKSOFT all=m

 CRC_ITU_T all=m
 CRC32 all=y
 CRC32_SELFTEST all=n
 CRC_ITU_T all=m
 CRC32 all=y
 CRC32_SELFTEST all=n


@@ -12788,13 +12914,16 @@ DYNAMIC_DEBUG all=n
 DYNAMIC_DEBUG_CORE all=n
 SYMBOLIC_ERRNAME all=y
 DEBUG_BUGVERBOSE all=y
 DYNAMIC_DEBUG_CORE all=n
 SYMBOLIC_ERRNAME all=y
 DEBUG_BUGVERBOSE all=y

+DEBUG_KERNEL all=y
+DEBUG_MISC all=y

 DEBUG_INFO all=y
 DEBUG_INFO all=y

+DEBUG_INFO_NONE all=n
+DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT all=y
+DEBUG_INFO_DWARF4 all=n
+DEBUG_INFO_DWARF5 all=n

 DEBUG_INFO_REDUCED all=n
 DEBUG_INFO_COMPRESSED all=y
 DEBUG_INFO_SPLIT all=y
 DEBUG_INFO_REDUCED all=n
 DEBUG_INFO_COMPRESSED all=y
 DEBUG_INFO_SPLIT all=y

-DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT all=n
-DEBUG_INFO_DWARF4 all=y
-DEBUG_INFO_DWARF5 all=n

 DEBUG_INFO_BTF all=n
 GDB_SCRIPTS all=y
 FRAME_WARN all=2048
 DEBUG_INFO_BTF all=n
 GDB_SCRIPTS all=y
 FRAME_WARN all=2048


@@ -12818,8 +12947,6 @@ DEBUG_FS_ALLOW_NONE all=n
 #- file lib/Kconfig.kgdb goes here
 #- file lib/Kconfig.ubsan goes here
 #- file lib/Kconfig.kcsan goes here
 #- file lib/Kconfig.kgdb goes here
 #- file lib/Kconfig.ubsan goes here
 #- file lib/Kconfig.kcsan goes here

-DEBUG_KERNEL all=y
-DEBUG_MISC all=y

 #- file net/Kconfig.debug goes here
 #- file mm/Kconfig.debug goes here
 DEBUG_OBJECTS all=n
 #- file net/Kconfig.debug goes here
 #- file mm/Kconfig.debug goes here
 DEBUG_OBJECTS all=n


@@ -12926,7 +13053,6 @@ TEST_SCANF=m
 TEST_BITMAP all=m
 TEST_UUID all=m
 TEST_XARRAY all=m
 TEST_BITMAP all=m
 TEST_UUID all=m
 TEST_XARRAY all=m

-TEST_OVERFLOW all=m

 TEST_RHASHTABLE all=n
 TEST_SIPHASH all=m
 TEST_IDA all=m
 TEST_RHASHTABLE all=n
 TEST_SIPHASH all=m
 TEST_IDA all=m


@@ -12947,7 +13073,6 @@ TEST_STATIC_KEYS all=m
 TEST_KMOD all=m
 TEST_MEMCAT_P all=m
 TEST_OBJAGG all=m
 TEST_KMOD all=m
 TEST_MEMCAT_P all=m
 TEST_OBJAGG all=m

-TEST_STACKINIT all=m

 TEST_MEMINIT all=m
 TEST_HMM all=m
 TEST_FREE_PAGES all=m
 TEST_MEMINIT all=m
 TEST_HMM all=m
 TEST_FREE_PAGES all=m


@@ -12973,6 +13098,7 @@ KCSAN all=n
 KFENCE all=y
 KFENCE_SAMPLE_INTERVAL all=100
 KFENCE_NUM_OBJECTS all=255
 KFENCE all=y
 KFENCE_SAMPLE_INTERVAL all=100
 KFENCE_NUM_OBJECTS all=255

+KFENCE_DEFERRABLE all=n

 KFENCE_STATIC_KEYS all=y
 
 #-
 KFENCE_STATIC_KEYS all=y
 
 #-


@@ -13119,6 +13245,7 @@ PTDUMP_DEBUGFS all=n
 DAMON all=y
 DAMON_VADDR all=y
 DAMON_PADDR all=y
 DAMON all=y
 DAMON_VADDR all=y
 DAMON_PADDR all=y

+DAMON_SYSFS all=y

 DAMON_DBGFS all=y
 DAMON_RECLAIM all=y
 
 DAMON_DBGFS all=y
 DAMON_RECLAIM all=y
 


@@ -13246,6 +13373,7 @@ WIRELESS all=y
 LWTUNNEL_BPF all=y
 DST_CACHE all=y
 NET_DEVLINK all=y
 LWTUNNEL_BPF all=y
 DST_CACHE all=y
 NET_DEVLINK all=y

+PAGE_POOL_STATS all=n

 FAILOVER all=m
 ETHTOOL_NETLINK all=y
 
 FAILOVER all=m
 ETHTOOL_NETLINK all=y
 


@@ -14308,6 +14436,7 @@ INTEGRITY_SIGNATURE all=y
 INTEGRITY_ASYMMETRIC_KEYS all=y
 INTEGRITY_TRUSTED_KEYRING all=y
 INTEGRITY_PLATFORM_KEYRING all=y
 INTEGRITY_ASYMMETRIC_KEYS all=y
 INTEGRITY_TRUSTED_KEYRING all=y
 INTEGRITY_PLATFORM_KEYRING all=y

+INTEGRITY_MACHINE_KEYRING all=y

 INTEGRITY_AUDIT all=y
 #- file security/integrity/ima/Kconfig goes here
 #- file security/integrity/evm/Kconfig goes here
 INTEGRITY_AUDIT all=y
 #- file security/integrity/ima/Kconfig goes here
 #- file security/integrity/evm/Kconfig goes here


@@ -14337,6 +14466,7 @@ PERSISTENT_KEYRINGS all=y
 BIG_KEYS all=y
 TRUSTED_KEYS all=m
 ENCRYPTED_KEYS all=y
 BIG_KEYS all=y
 TRUSTED_KEYS all=m
 ENCRYPTED_KEYS all=y

+USER_DECRYPTED_DATA all=y

 KEY_DH_OPERATIONS all=y
 KEY_NOTIFICATIONS all=y
 
 KEY_DH_OPERATIONS all=y
 KEY_NOTIFICATIONS all=y
 


@@ -14784,6 +14914,7 @@ SND_AMD_ACP_CONFIG arm=m arm64=m
 #- *** FILE: sound/soc/amd/acp/Kconfig ***
 #-
 SND_SOC_AMD_ACP_COMMON all=m
 #- *** FILE: sound/soc/amd/acp/Kconfig ***
 #-
 SND_SOC_AMD_ACP_COMMON all=m

+SND_SOC_AMD_ACP_PCI all=m

 SND_AMD_ASOC_RENOIR all=m
 SND_SOC_AMD_LEGACY_MACH all=m
 SND_SOC_AMD_SOF_MACH all=m
 SND_AMD_ASOC_RENOIR all=m
 SND_SOC_AMD_LEGACY_MACH all=m
 SND_SOC_AMD_SOF_MACH all=m


@@ -14799,9 +14930,6 @@ SND_SOC_MIKROE_PROTO arm=m arm64=m
 #-
 SND_BCM2835_SOC_I2S arm=m
 SND_BCM63XX_I2S_WHISTLER all=m
 #-
 SND_BCM2835_SOC_I2S arm=m
 SND_BCM63XX_I2S_WHISTLER all=m

-SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
-SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
-SND_RPI_WM8804_SOUNDCARD arm=m arm64=m

 
 #-
 #- *** FILE: sound/soc/codecs/Kconfig ***
 
 #-
 #- *** FILE: sound/soc/codecs/Kconfig ***


@@ -14827,6 +14955,7 @@ SND_SOC_AK4642 all=m
 SND_SOC_AK5386 all=m
 SND_SOC_AK5558 all=m
 SND_SOC_ALC5623 all=m
 SND_SOC_AK5386 all=m
 SND_SOC_AK5558 all=m
 SND_SOC_ALC5623 all=m

+SND_SOC_AW8738 all=m

 SND_SOC_BD28623 all=m
 SND_SOC_BT_SCO all=m
 SND_SOC_CPCAP arm=m arm64=m
 SND_SOC_BD28623 all=m
 SND_SOC_BT_SCO all=m
 SND_SOC_CPCAP arm=m arm64=m


@@ -14934,6 +15063,7 @@ SND_SOC_TAS2770 all=m
 SND_SOC_TAS5086 all=m
 SND_SOC_TAS571X all=m
 SND_SOC_TAS5720 all=m
 SND_SOC_TAS5086 all=m
 SND_SOC_TAS571X all=m
 SND_SOC_TAS5720 all=m

+SND_SOC_TAS5805M all=m

 SND_SOC_TAS6424 all=m
 SND_SOC_TDA7419 all=m
 SND_SOC_TFA9879 all=m
 SND_SOC_TAS6424 all=m
 SND_SOC_TDA7419 all=m
 SND_SOC_TFA9879 all=m


@@ -15070,6 +15200,7 @@ SND_SOC_INTEL_CML_H all=m
 SND_SOC_INTEL_CML_LP all=m
 SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC all=y
 SND_SOC_INTEL_KEEMBAY arm64=m
 SND_SOC_INTEL_CML_LP all=m
 SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC all=y
 SND_SOC_INTEL_KEEMBAY arm64=m

+SND_SOC_INTEL_AVS all=m

 #- file sound/soc/intel/boards/Kconfig goes here
 
 #-
 #- file sound/soc/intel/boards/Kconfig goes here
 
 #-


@@ -15113,6 +15244,7 @@ SND_SOC_INTEL_SOF_NAU8825_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_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_SOF_SSP_AMP_MACH all=m

 SND_SOC_INTEL_EHL_RT5660_MACH all=m
 SND_SOC_INTEL_SOUNDWIRE_SOF_MACH all=m
 
 SND_SOC_INTEL_EHL_RT5660_MACH all=m
 SND_SOC_INTEL_SOUNDWIRE_SOF_MACH all=m
 


@@ -15306,6 +15438,8 @@ RD_ZSTD all=y
 88EU_AP_MODE all=y
 AB3100_CORE all=y
 AB3100_OTP all=m
 88EU_AP_MODE all=y
 AB3100_CORE all=y
 AB3100_OTP all=m

+AB8500_DEBUG all=n
+ASYMMETRIC_TPM_KEY_SUBTYPE all=m

 BINFMT_EM86 alpha=m
 BLK_CMDLINE_PARSER all=y
 BLK_DEV_4DRIVES alpha=m i386=m
 BINFMT_EM86 alpha=m
 BLK_CMDLINE_PARSER all=y
 BLK_DEV_4DRIVES alpha=m i386=m


@@ -15380,6 +15514,7 @@ DEV_DAX_PMEM_COMPAT all=m
 DISCONTIGMEM_MANUAL all=n
 DRM_AMDGPU_GART_DEBUGFS all=n
 DRM_GMA600 all=y
 DISCONTIGMEM_MANUAL all=n
 DRM_AMDGPU_GART_DEBUGFS all=n
 DRM_GMA600 all=y

+DRM_PANEL_SONY_ACX424AKP arm=m arm64=m

 DSCC4_PCISYNC all=y
 DSCC4_PCI_RST all=y
 EROFS_FS_CLUSTER_PAGE_LIMIT all=1
 DSCC4_PCISYNC all=y
 DSCC4_PCI_RST all=y
 EROFS_FS_CLUSTER_PAGE_LIMIT all=1


@@ -15388,8 +15523,10 @@ FB_TFT_WATTEROTT all=m
 FSCACHE_HISTOGRAM all=n
 FSCACHE_OBJECT_LIST all=n
 GCC_PLUGIN_CYC_COMPLEXITY all=n
 FSCACHE_HISTOGRAM all=n
 FSCACHE_OBJECT_LIST all=n
 GCC_PLUGIN_CYC_COMPLEXITY all=n

+GS_FPGABOOT all=m

 HARDENED_USERCOPY_FALLBACK all=y
 HP_WIRELESS all=m
 HARDENED_USERCOPY_FALLBACK all=y
 HP_WIRELESS all=m

+I2C_MULTI_INSTANTIATE all=m

 ICST=y
 #* on PowerPC IDE must be 'y' to be able to select BLK_DEV_IDE_PMAC
 IDE all=m ppc=y ppc64=y sparc=n
 ICST=y
 #* on PowerPC IDE must be 'y' to be able to select BLK_DEV_IDE_PMAC
 IDE all=m ppc=y ppc64=y sparc=n


@@ -15402,6 +15539,7 @@ IDE_PROC_FS all=y
 IDE_TASK_IOCTL all=y
 INFINIBAND_HNS_HIP06 arm64=n
 INFINIBAND_I40IW all=m
 IDE_TASK_IOCTL all=y
 INFINIBAND_HNS_HIP06 arm64=n
 INFINIBAND_I40IW all=m

+INTEL_CHT_INT33FE all=m

 IR_SIR all=m
 ISI all=m
 IWLWIFI_BCAST_FILTERING all=y
 IR_SIR all=m
 ISI all=m
 IWLWIFI_BCAST_FILTERING all=y


@@ -15414,7 +15552,9 @@ MLXSW_SWITCHIB all=m
 MLXSW_SWITCHX2 all=m
 MODULE_COMPRESS all=y
 MOST_SOUND all=m
 MLXSW_SWITCHX2 all=m
 MODULE_COMPRESS all=y
 MOST_SOUND all=m

+ND_BLK all=m

 NET_DSA_TAG_8021Q all=m
 NET_DSA_TAG_8021Q all=m

+NFSD_V3 all=y

 NFT_COUNTER all=m
 NF_FLOW_TABLE_IPV4 all=m
 NF_FLOW_TABLE_IPV6 all=m
 NFT_COUNTER all=m
 NF_FLOW_TABLE_IPV4 all=m
 NF_FLOW_TABLE_IPV6 all=m


@@ -15423,6 +15563,7 @@ NF_LOG_NETDEV all=m
 NVM all=y
 NVM_PBLK all=m
 NVM_PBLK_DEBUG all=n
 NVM all=y
 NVM_PBLK all=m
 NVM_PBLK_DEBUG all=n

+OPTEE_SHM_NUM_PRIV_PAGES arm=1 arm64=1

 PRISM54 all=m
 R3964 all=m
 RAPIDIO_TSI568 all=m
 PRISM54 all=m
 R3964 all=m
 RAPIDIO_TSI568 all=m


@@ -15434,15 +15575,26 @@ SATA_DWC_DEBUG all=n
 SBNI i386=m x86_64=m
 SBNI_MULTILINE i386=y x86_64=y
 SENSORS_AMD_ENERGY all=m
 SBNI i386=m x86_64=m
 SBNI_MULTILINE i386=y x86_64=y
 SENSORS_AMD_ENERGY all=m

+SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
+SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
+SND_RPI_WM8804_SOUNDCARD arm=m arm64=m

 SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 all=y
 SND_SOC_ZX_AUD96P22 all=m
 SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 all=y
 SND_SOC_ZX_AUD96P22 all=m

+SPI_INTEL_SPI_PCI all=m
+SPI_INTEL_SPI_PLATFORM all=m

 STAGING_APEX_DRIVER all=m
 STAGING_GASKET_FRAMEWORK all=m
 STAGING_APEX_DRIVER all=m
 STAGING_GASKET_FRAMEWORK all=m

+SURFACE_3_BUTTON all=m

 TEST_HASH all=m
 TEST_HASH all=m

+TEST_OVERFLOW all=m
+TEST_STACKINIT all=m
+TPM_KEY_PARSER all=m

 TRACE_ROUTER all=m
 TRACE_SINK all=m
 VFIO_MDEV_DEVICE all=m
 TRACE_ROUTER all=m
 TRACE_SINK all=m
 VFIO_MDEV_DEVICE all=m

+VIDEO_CADENCE all=y

 VIDEO_IVTV_DEPRECATED_IOCTLS all=n
 VIDEO_IVTV_DEPRECATED_IOCTLS all=n

+VIDEO_V4L2 all=m

 WIMAX all=m
 WIMAX_DEBUG_LEVEL all=8
 WIMAX_I2400M_DEBUG_LEVEL all=8
 WIMAX all=m
 WIMAX_DEBUG_LEVEL all=8
 WIMAX_I2400M_DEBUG_LEVEL all=8

diff --git a/kernel-x86.config b/kernel-x86.config
index 77b0708d9c032ec87d9b7bcf84dbed1be3fe4f62..0f85cd2a21b65e04578093c9689199777b37112b 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -53,7 +53,6 @@ VM86 i386=y
 X86_VSYSCALL_EMULATION x86=y
 X86_IOPL_IOPERM x86=y
 TOSHIBA i386=m
 X86_VSYSCALL_EMULATION x86=y
 X86_IOPL_IOPERM x86=y
 TOSHIBA i386=m

-I8K x86=m

 X86_REBOOTFIXUPS i386=y
 MICROCODE all=y
 MICROCODE_INTEL x86=y
 X86_REBOOTFIXUPS i386=y
 MICROCODE all=y
 MICROCODE_INTEL x86=y


@@ -131,7 +130,6 @@ NET5501 i486=y i586=y i686=y
 GEOS i486=y i586=y i686=y
 IA32_EMULATION x86_64=y
 IA32_AOUT x86_64=y
 GEOS i486=y i586=y i686=y
 IA32_EMULATION x86_64=y
 IA32_AOUT x86_64=y

-X86_X32 x86_64=y

 #- file arch/x86/kvm/Kconfig goes here
 #- file arch/x86/Kconfig.assembler goes here
 
 #- file arch/x86/kvm/Kconfig goes here
 #- file arch/x86/Kconfig.assembler goes here
 


@@ -182,7 +180,6 @@ X86_SGX_KVM all=y
 KVM_AMD x86=m
 KVM_AMD_SEV all=y
 KVM_XEN all=y
 KVM_AMD x86=m
 KVM_AMD_SEV all=y
 KVM_XEN all=y

-KVM_MMU_AUDIT x86=y

 
 #-
 #- *** FILE: arch/x86/xen/Kconfig ***
 
 #-
 #- *** FILE: arch/x86/xen/Kconfig ***


@@ -227,4 +224,7 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
 EFI_CAPSULE_QUIRK_QUARK_CSH i386=y
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
 EFI_CAPSULE_QUIRK_QUARK_CSH i386=y

+I8K x86=m
+KVM_MMU_AUDIT x86=y

 X86_RESERVE_LOW x86=64
 X86_RESERVE_LOW x86=64

+X86_X32 x86_64=y

diff --git a/kernel.spec b/kernel.spec
index 1a631781f84af73bae75be3f322623f6009e8522..27e14b35bc6c60bce0098d6fe9cb30fc76034532 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,8 +66,8 @@
 %endif
 
 %define                rel             1
 %endif
 
 %define                rel             1

-%define                basever         5.17
-%define                postver         .7
+%define                basever         5.18
+%define                postver         .0

 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}


@@ -118,7 +118,7 @@ Epoch:              3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz

-# Source0-md5: 07321a70a48d062cebd0358132f11771
+# Source0-md5: 58e80452e2d8e1993cd7ec95e697ab5a

 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
 # Patch0-md5:  c942f79b0f310ca6e8d5828fad539a7f
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
 # Patch0-md5:  c942f79b0f310ca6e8d5828fad539a7f


@@ -708,7 +708,7 @@ find -name '*.py' -print0 | \
        scripts/show_delta \
        tools/hv/vmbus_testing \
        tools/kvm/kvm_stat/kvm_stat \
        scripts/show_delta \
        tools/hv/vmbus_testing \
        tools/kvm/kvm_stat/kvm_stat \

-       tools/testing/selftests/exec/binfmt_script
+       tools/testing/selftests/exec/binfmt_script.py

 
 find -name '*.pl' -print0 | \
        xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
 
 find -name '*.pl' -print0 | \
        xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \

diff --git a/update-source.sh b/update-source.sh
index 5056908d89da688a844a7f6bf360d8698e814660..5f635b6bbdf431b64a90b654e7cec5a57effbfb6 100755 (executable)
--- a/update-source.sh
+++ b/update-source.sh
@@ -7,7 +7,7 @@ BRANCH=aufs5.x-rcN
 # aufs5
 [ -d aufs5-standalone ] || git clone https://github.com/sfjro/aufs5-standalone.git
 cd aufs5-standalone
 # aufs5
 [ -d aufs5-standalone ] || git clone https://github.com/sfjro/aufs5-standalone.git
 cd aufs5-standalone

-git checkout -b ${BRANCH} origin/${BRANCH}
+git checkout -b ${BRANCH} origin/${BRANCH} || git switch ${BRANCH}

 git pull
 cat aufs5-kbuild.patch aufs5-base.patch aufs5-mmap.patch aufs5-standalone.patch > ../kernel-aufs5.patch
 rm -rf linux && mkdir linux
 git pull
 cat aufs5-kbuild.patch aufs5-base.patch aufs5-mmap.patch aufs5-standalone.patch > ../kernel-aufs5.patch
 rm -rf linux && mkdir linux