- up to 5.1.0

diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch
index 77f61151fbeaf136f9659eb2ea6230ce5a976833..20e694b188210df3f0089dff015e956e1572eefc 100644 (file)
--- a/kernel-aufs4.patch
+++ b/kernel-aufs4.patch
@@ -5,10 +5,9 @@ diff --git a/fs/Kconfig b/fs/Kconfig
 index ac474a61be37..284cee954591 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -255,6 +255,7 @@ source "fs/pstore/Kconfig"
+@@ -255,5 +255,6 @@ source "fs/pstore/Kconfig"
  source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
- source "fs/exofs/Kconfig"
 +source "fs/aufs/Kconfig"
  
  endif # MISC_FILESYSTEMS
@@ -26,17 +25,17 @@ SPDX-License-Identifier: GPL-2.0
 aufs4.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 8c68de3cfd80..c08e5dd95b5f 100644
+index dce5c099f43c..d10f05c88860 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2636,6 +2636,19 @@ F:      include/linux/audit.h
+@@ -2635,6 +2635,19 @@ F:      include/linux/audit.h
  F:    include/uapi/linux/audit.h
  F:    kernel/audit*
  
 +AUFS (advanced multi layered unification filesystem) FILESYSTEM
 +M:    "J. R. Okajima" <hooanon05g@gmail.com>
-+L:    linux-unionfs@vger.kernel.org
 +L:    aufs-users@lists.sourceforge.net (members only)
++L:    linux-unionfs@vger.kernel.org
 +W:    http://aufs.sourceforge.net
 +T:    git://github.com/sfjro/aufs4-linux.git
 +S:    Supported
@@ -114,10 +113,10 @@ index 083185174c6d..78234ee16784 100644
                return error;
  
 diff --git a/fs/inode.c b/fs/inode.c
-index 0cd47fe0dbe5..117e6d16c3a1 100644
+index 73432e64f874..4a1756b8b4bd 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1660,7 +1660,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1657,7 +1657,7 @@ EXPORT_SYMBOL(generic_update_time);
   * This does the actual work of updating an inodes time or version.  Must have
   * had called mnt_want_write() before calling this.
   */
@@ -127,7 +126,7 @@ index 0cd47fe0dbe5..117e6d16c3a1 100644
        int (*update_time)(struct inode *, struct timespec64 *, int);
  
 diff --git a/fs/namespace.c b/fs/namespace.c
-index a677b59efd74..c3af16d31a75 100644
+index 678ef175d63a..9b6a3d0f87a1 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -768,6 +768,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -346,10 +345,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs4.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 633a63462573..cb290f06bd7e 100644
+index f5ed9512d193..e8f8e59d93bb 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2018,7 +2018,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2014,7 +2014,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
        down_read(&mm->mmap_sem);
        vma = find_exact_vma(mm, vm_start, vm_end);
        if (vma && vma->vm_file) {
@@ -375,7 +374,7 @@ index 3b63be64e436..fb9913bf3d10 100644
                ino = inode->i_ino;
        }
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index f0ec9edab2f3..35e9e2a9cc15 100644
+index 85b0ef890b28..0f7fb8138160 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@@ -390,7 +389,7 @@ index f0ec9edab2f3..35e9e2a9cc15 100644
                dev = inode->i_sb->s_dev;
                ino = inode->i_ino;
                pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1734,7 +1737,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1740,7 +1743,7 @@ static int show_numa_map(struct seq_file *m, void *v)
        struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
        struct vm_area_struct *vma = v;
        struct numa_maps *md = &numa_priv->md;
@@ -508,7 +507,7 @@ index 9f5e323e883e..90db684a7cf4 100644
        if (page->mapping != inode->i_mapping) {
                unlock_page(page);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index f901065c4c64..1089a8328a53 100644
+index fc1809b1bed6..8f62e47a60ea 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -539,7 +538,7 @@ index f901065c4c64..1089a8328a53 100644
  
        /* Undo any partial mapping done by a device driver. */
        unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2676,7 +2676,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2675,7 +2675,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
                goto out_free_mpol;
  
        if (new->vm_file)
@@ -548,7 +547,7 @@ index f901065c4c64..1089a8328a53 100644
  
        if (new->vm_ops && new->vm_ops->open)
                new->vm_ops->open(new);
-@@ -2695,7 +2695,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2694,7 +2694,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
        if (new->vm_ops && new->vm_ops->close)
                new->vm_ops->close(new);
        if (new->vm_file)
@@ -557,7 +556,7 @@ index f901065c4c64..1089a8328a53 100644
        unlink_anon_vmas(new);
   out_free_mpol:
        mpol_put(vma_policy(new));
-@@ -2885,7 +2885,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2884,7 +2884,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
        struct vm_area_struct *vma;
        unsigned long populate = 0;
        unsigned long ret = -EINVAL;
@@ -566,7 +565,7 @@ index f901065c4c64..1089a8328a53 100644
  
        pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
                     current->comm, current->pid);
-@@ -2960,10 +2960,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2959,10 +2959,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
                }
        }
  
@@ -595,7 +594,7 @@ index f901065c4c64..1089a8328a53 100644
  out:
        up_write(&mm->mmap_sem);
        if (populate)
-@@ -3253,7 +3270,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3252,7 +3269,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
                if (anon_vma_clone(new_vma, vma))
                        goto out_free_mempol;
                if (new_vma->vm_file)
@@ -605,7 +604,7 @@ index f901065c4c64..1089a8328a53 100644
                        new_vma->vm_ops->open(new_vma);
                vma_link(mm, new_vma, prev, rb_link, rb_parent);
 diff --git a/mm/nommu.c b/mm/nommu.c
-index 749276beb109..d56f8f2bbd24 100644
+index 749276beb109..c7957f06fbc4 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
 @@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm_region *region)
@@ -635,7 +634,7 @@ index 749276beb109..d56f8f2bbd24 100644
                        kmem_cache_free(vm_region_jar, region);
                        region = pregion;
                        result = start;
-@@ -1361,7 +1361,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1361,10 +1361,10 @@ unsigned long do_mmap(struct file *file,
        up_write(&nommu_region_sem);
  error:
        if (region->vm_file)
@@ -643,7 +642,11 @@ index 749276beb109..d56f8f2bbd24 100644
 +              vmr_fput(region);
        kmem_cache_free(vm_region_jar, region);
        if (vma->vm_file)
-               fput(vma->vm_file);
+-              fput(vma->vm_file);
++              vma_fput(vma);
+       vm_area_free(vma);
+       return ret;
+ 
 diff --git a/mm/prfile.c b/mm/prfile.c
 new file mode 100644
 index 000000000000..024cdcfae1b1
@@ -812,10 +815,10 @@ index 5679e7fcb6b0..961eec3df1eb 100644
  void __init files_init(void)
  {
 diff --git a/fs/inode.c b/fs/inode.c
-index 117e6d16c3a1..63a31af2f9d8 100644
+index 4a1756b8b4bd..6e51d5f9b9f3 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1669,6 +1669,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
+@@ -1666,6 +1666,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
  
        return update_time(inode, time, flags);
  }
@@ -824,7 +827,7 @@ index 117e6d16c3a1..63a31af2f9d8 100644
  /**
   *    touch_atime     -       update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index c3af16d31a75..f9fc947a6600 100644
+index 9b6a3d0f87a1..8c4d3d56f2df 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -434,6 +434,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -7479,8 +7482,8 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
 +#endif /* __AUFS_DCSUB_H__ */
 diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 --- /usr/share/empty/fs/aufs/debug.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c      2019-03-05 12:13:00.135890907 +0100
-@@ -0,0 +1,440 @@
++++ linux/fs/aufs/debug.c      2019-05-06 09:03:04.816810402 +0200
+@@ -0,0 +1,441 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -7503,6 +7506,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 + * debug print functions
 + */
 +
++#include <linux/iversion.h>
 +#include "aufs.h"
 +
 +/* Returns 0, or -errno.  arg is in kp->arg. */
@@ -8153,8 +8157,8 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
 +#endif /* __AUFS_DEBUG_H__ */
 diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 --- /usr/share/empty/fs/aufs/dentry.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c     2019-03-05 12:13:00.135890907 +0100
-@@ -0,0 +1,1153 @@
++++ linux/fs/aufs/dentry.c     2019-05-06 09:03:04.816810402 +0200
+@@ -0,0 +1,1154 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -8177,6 +8181,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 + * lookup and dentry operations
 + */
 +
++#include <linux/iversion.h>
 +#include <linux/namei.h>
 +#include "aufs.h"
 +
@@ -10140,8 +10145,8 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 --- /usr/share/empty/fs/aufs/dir.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c        2019-03-05 12:13:00.135890907 +0100
-@@ -0,0 +1,762 @@
++++ linux/fs/aufs/dir.c        2019-05-06 09:03:04.816810402 +0200
+@@ -0,0 +1,763 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -10165,6 +10170,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 + */
 +
 +#include <linux/fs_stack.h>
++#include <linux/iversion.h>
 +#include "aufs.h"
 +
 +void au_add_nlink(struct inode *dir, struct inode *h_dir)
@@ -17254,8 +17260,8 @@ diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
 +}
 diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 --- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c    2019-03-05 12:13:00.139224339 +0100
-@@ -0,0 +1,720 @@
++++ linux/fs/aufs/hnotify.c    2019-05-06 09:03:04.816810402 +0200
+@@ -0,0 +1,721 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -17278,6 +17284,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 + * abstraction to notify the direct changes on lower directories
 + */
 +
++/* #include <linux/iversion.h> */
 +#include "aufs.h"
 +
 +int au_hn_alloc(struct au_hinode *hinode, struct inode *inode)
@@ -18268,8 +18275,8 @@ diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
 --- /usr/share/empty/fs/aufs/inode.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c      2019-03-05 12:13:00.139224339 +0100
-@@ -0,0 +1,528 @@
++++ linux/fs/aufs/inode.c      2019-05-06 09:03:04.820143837 +0200
+@@ -0,0 +1,529 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -18292,6 +18299,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
 + * inode functions
 + */
 +
++#include <linux/iversion.h>
 +#include "aufs.h"
 +
 +struct inode *au_igrab(struct inode *inode)
@@ -19726,8 +19734,8 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
 +#endif
 diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 --- /usr/share/empty/fs/aufs/i_op_add.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c   2019-03-05 12:13:00.139224339 +0100
-@@ -0,0 +1,935 @@
++++ linux/fs/aufs/i_op_add.c   2019-05-06 09:03:04.816810402 +0200
+@@ -0,0 +1,936 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -19750,6 +19758,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 + * inode operations (add entry)
 + */
 +
++#include <linux/iversion.h>
 +#include "aufs.h"
 +
 +/*
@@ -20665,8 +20674,8 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 --- /usr/share/empty/fs/aufs/i_op.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c       2019-03-05 12:13:00.139224339 +0100
-@@ -0,0 +1,1506 @@
++++ linux/fs/aufs/i_op.c       2019-05-06 09:03:04.816810402 +0200
+@@ -0,0 +1,1507 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -20691,6 +20700,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 +
 +#include <linux/device_cgroup.h>
 +#include <linux/fs_stack.h>
++#include <linux/iversion.h>
 +#include <linux/namei.h>
 +#include <linux/security.h>
 +#include "aufs.h"
@@ -22175,8 +22185,8 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 +};
 diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
 --- /usr/share/empty/fs/aufs/i_op_del.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_del.c   2019-03-05 12:13:00.139224339 +0100
-@@ -0,0 +1,512 @@
++++ linux/fs/aufs/i_op_del.c   2019-05-06 09:03:04.816810402 +0200
+@@ -0,0 +1,513 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -22199,6 +22209,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
 + * inode operations (del entry)
 + */
 +
++#include <linux/iversion.h>
 +#include "aufs.h"
 +
 +/*
@@ -22691,8 +22702,8 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
 --- /usr/share/empty/fs/aufs/i_op_ren.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c   2019-03-05 12:13:00.139224339 +0100
-@@ -0,0 +1,1249 @@
++++ linux/fs/aufs/i_op_ren.c   2019-05-06 09:03:04.820143837 +0200
+@@ -0,0 +1,1250 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -22716,6 +22727,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
 + * todo: this is crazy monster
 + */
 +
++#include <linux/iversion.h>
 +#include "aufs.h"
 +
 +enum { AuSRC, AuDST, AuSrcDst };
@@ -24489,8 +24501,8 @@ diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
 +}
 diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
 --- /usr/share/empty/fs/aufs/loop.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.h       2019-03-05 12:13:00.142557771 +0100
-@@ -0,0 +1,53 @@
++++ linux/fs/aufs/loop.h       2019-05-06 09:03:04.820143837 +0200
+@@ -0,0 +1,55 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -24533,6 +24545,8 @@ diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
 +int au_loopback_init(void);
 +void au_loopback_fin(void);
 +#else
++AuStub(struct file *, loop_backing_file, return NULL)
++
 +AuStubInt0(au_test_loopback_overlap, struct super_block *sb,
 +         struct dentry *h_adding)
 +AuStubInt0(au_test_loopback_kthread, void)
@@ -27669,7 +27683,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +}
 diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
 --- /usr/share/empty/fs/aufs/opts.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h       2019-03-05 12:13:00.142557771 +0100
++++ linux/fs/aufs/opts.h       2019-05-06 09:03:04.820143837 +0200
 @@ -0,0 +1,225 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -27719,7 +27733,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
 +#define AuOpt_SUM             (1 << 10)       /* summation for statfs(2) */
 +#define AuOpt_SUM_W           (1 << 11)       /* unimplemented */
 +#define AuOpt_WARN_PERM               (1 << 12)       /* warn when add-branch */
-+#define AuOpt_VERBOSE         (1 << 13)       /* busy inode when del-branch */
++#define AuOpt_VERBOSE         (1 << 13)       /* print the cause of error */
 +#define AuOpt_DIO             (1 << 14)       /* direct io */
 +#define AuOpt_DIRREN          (1 << 15)       /* directory rename */
 +
@@ -29220,8 +29234,8 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
 +#endif /* __AUFS_RWSEM_H__ */
 diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 --- /usr/share/empty/fs/aufs/sbinfo.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sbinfo.c     2019-03-05 12:13:00.142557771 +0100
-@@ -0,0 +1,313 @@
++++ linux/fs/aufs/sbinfo.c     2019-05-06 09:03:04.820143837 +0200
+@@ -0,0 +1,314 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -29244,6 +29258,7 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 + * superblock private data
 + */
 +
++#include <linux/iversion.h>
 +#include "aufs.h"
 +
 +/*
@@ -29537,8 +29552,8 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 --- /usr/share/empty/fs/aufs/super.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c      2019-03-05 12:13:00.142557771 +0100
-@@ -0,0 +1,1048 @@
++++ linux/fs/aufs/super.c      2019-05-06 09:03:04.820143837 +0200
+@@ -0,0 +1,1049 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -29561,6 +29576,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 + * mount and super_block operations
 + */
 +
++#include <linux/iversion.h>
 +#include <linux/mm.h>
 +#include <linux/seq_file.h>
 +#include <linux/statfs.h>
@@ -31927,8 +31943,8 @@ diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 --- /usr/share/empty/fs/aufs/vdir.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c       2019-03-05 12:13:00.145891204 +0100
-@@ -0,0 +1,895 @@
++++ linux/fs/aufs/vdir.c       2019-05-06 09:03:04.820143837 +0200
+@@ -0,0 +1,896 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -31951,6 +31967,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 + * virtual or vertical directory
 + */
 +
++#include <linux/iversion.h>
 +#include "aufs.h"
 +
 +static unsigned int calc_size(int nlen)
@@ -33732,8 +33749,8 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 --- /usr/share/empty/fs/aufs/vfsub.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h      2019-03-05 12:13:00.145891204 +0100
-@@ -0,0 +1,355 @@
++++ linux/fs/aufs/vfsub.h      2019-05-06 09:03:04.820143837 +0200
+@@ -0,0 +1,354 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
 + * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -33762,7 +33779,6 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 +#ifdef __KERNEL__
 +
 +#include <linux/fs.h>
-+#include <linux/iversion.h>
 +#include <linux/mount.h>
 +#include <linux/posix_acl.h>
 +#include <linux/xattr.h>
@@ -38890,7 +38906,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +}
 diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
 --- /usr/share/empty/include/uapi/linux/aufs_type.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h       2019-03-05 12:13:00.155891502 +0100
++++ linux/include/uapi/linux/aufs_type.h       2019-05-06 09:03:04.820143837 +0200
 @@ -0,0 +1,448 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -38934,7 +38950,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +
 +#include <linux/limits.h>
 +
-+#define AUFS_VERSION  "4.x-rcN-20190211"
++#define AUFS_VERSION  "4.x-rcN-20190311"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC      ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39532,22 +39548,19 @@ index f05887d612fd..6f0505723cb4 100644
 +      return f;
 +}
 diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index a570730f5482..255e2d3763e7 100644
+index c42cbe71ed4b..255e2d3763e7 100644
 --- a/fs/aufs/loop.h
 +++ b/fs/aufs/loop.h
-@@ -26,7 +26,11 @@ void au_warn_loopback(struct super_block *h_sb);
+@@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
  
  int au_loopback_init(void);
  void au_loopback_fin(void);
 +
 +struct file *aufs_real_loop(struct file *file);
  #else
-+AuStub(struct file *, loop_backing_file, return NULL)
-+
- AuStubInt0(au_test_loopback_overlap, struct super_block *sb,
-          struct dentry *h_adding)
- AuStubInt0(au_test_loopback_kthread, void)
-@@ -34,6 +38,8 @@ AuStubVoid(au_warn_loopback, struct super_block *h_sb)
+ AuStub(struct file *, loop_backing_file, return NULL)
+ 
+@@ -36,6 +38,8 @@ AuStubVoid(au_warn_loopback, struct super_block *h_sb)
  
  AuStubInt0(au_loopback_init, void)
  AuStubVoid(au_loopback_fin, void)
@@ -39557,10 +39570,10 @@ index a570730f5482..255e2d3763e7 100644
  
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 7c270b14f8c9..61938c274f05 100644
+index 73255f63b80c..f04e211cbf89 100644
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
-@@ -845,7 +845,10 @@ static const struct super_operations aufs_sop = {
+@@ -846,7 +846,10 @@ static const struct super_operations aufs_sop = {
        .statfs         = aufs_statfs,
        .put_super      = aufs_put_super,
        .sync_fs        = aufs_sync_fs,

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 2e1913e08f2d9ed6d8298afb48abe344a662c8f8..b5dc513f8c2d3bf1c6e24d2137b2edc9fb075b1c 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -6,7 +6,6 @@ ARCH_MEMORY_PROBE all=n
 DEBUG_ENTRY all=n
 DEBUG_IMR_SELFTEST all=n
 DEBUG_WX all=y
-EARLY_PRINTK_EFI all=n
 EARLY_PRINTK_USB_XDBC all=n
 EFI_MIXED all=y
 EFI_PGT_DUMP all=n
@@ -498,10 +497,13 @@ KS0108_DELAY all=2
 CFAG12864B i386=m x86_64=m
 CFAG12864B_RATE i386=20 x86_64=20
 IMG_ASCII_LCD all=y
-PANEL all=m
 PANEL_PARPORT all=0
 PANEL_PROFILE all=5
 PANEL_CHANGE_MESSAGE all=n
+CHARLCD_BL_OFF all=n
+CHARLCD_BL_ON all=n
+CHARLCD_BL_FLASH all=y
+PANEL all=m
 
 #-
 #- *** FILE: drivers/base/Kconfig ***
@@ -521,14 +523,6 @@ DEBUG_TEST_DRIVER_REMOVE all=n
 #- file drivers/base/test/Kconfig goes here
 #- file drivers/base/regmap/Kconfig goes here
 DMA_FENCE_TRACE all=n
-DMA_CMA all=y
-#- Default contiguous memory area size:
-CMA_SIZE_MBYTES all=64
-CMA_SIZE_SEL_MBYTES all=y
-CMA_SIZE_SEL_PERCENTAGE all=n
-CMA_SIZE_SEL_MIN all=n
-CMA_SIZE_SEL_MAX all=n
-CMA_ALIGNMENT all=8
 
 #-
 #- *** FILE: drivers/base/firmware_loader/Kconfig ***
@@ -906,6 +900,8 @@ X86_AMD_FREQ_SENSITIVITY all=m
 CPU_IDLE i386=y sparc64=n x86_64=y
 CPU_IDLE_MULTIPLE_DRIVERS all=y
 CPU_IDLE_GOV_LADDER all=y
+CPU_IDLE_GOV_MENU all=y
+CPU_IDLE_GOV_TEO all=y
 #- file drivers/cpuidle/Kconfig.arm goes here
 #- file drivers/cpuidle/Kconfig.mips goes here
 #- file drivers/cpuidle/Kconfig.powerpc goes here
@@ -975,6 +971,8 @@ CRYPTO_DEV_VIRTIO all=m
 #-
 DEV_DAX all=m
 DEV_DAX_PMEM all=m
+DEV_DAX_KMEM all=m
+DEV_DAX_PMEM_COMPAT all=m
 
 #-
 #- *** FILE: drivers/devfreq/Kconfig ***
@@ -1072,6 +1070,7 @@ EDAC_I5100 i386=m x86_64=m
 EDAC_I7300 all=m
 EDAC_SBRIDGE all=m
 EDAC_SKX all=m
+EDAC_I10NM all=m
 EDAC_PND2 all=m
 EDAC_PASEMI ppc64=m
 EDAC_CELL ppc64=m
@@ -1099,6 +1098,7 @@ EXTCON_INTEL_INT3496 all=m
 EXTCON_MAX14577 all=m
 EXTCON_MAX3355 all=m
 EXTCON_MAX77693 all=m
+EXTCON_PTN5150 all=m
 EXTCON_QCOM_SPMI_MISC all=m
 EXTCON_RT8973A all=m
 EXTCON_SM5502 all=m
@@ -1183,6 +1183,7 @@ FPGA_MGR_ZYNQ_FPGA all=m
 FPGA_MGR_XILINX_SPI all=m
 FPGA_MGR_MACHXO2_SPI all=m
 FPGA_BRIDGE all=m
+ALTERA_FREEZE_BRIDGE all=m
 XILINX_PR_DECOUPLER all=m
 FPGA_REGION all=m
 FPGA_DFL all=m
@@ -1205,6 +1206,7 @@ FSI_SCOM all=m
 #- *** FILE: drivers/gnss/Kconfig ***
 #-
 GNSS all=m
+GNSS_MTK_SERIAL all=m
 GNSS_SIRF_SERIAL all=m
 GNSS_UBX_SERIAL all=m
 
@@ -1229,6 +1231,7 @@ GPIO_STA2X11 all=y
 GPIO_VX855 all=m
 GPIO_XILINX powerpc=y
 GPIO_ZX all=y
+GPIO_AMD_FCH all=m
 GPIO_104_DIO_48E all=m
 GPIO_104_IDIO_16 all=m
 GPIO_104_IDI_48 all=m
@@ -1262,6 +1265,7 @@ GPIO_TIMBERDALE all=y
 GPIO_TPS65086 all=m
 GPIO_TPS65218 all=m
 GPIO_TPS65912 all=m
+GPIO_TQMX86 all=m
 GPIO_TWL4030 powerpc=m
 GPIO_UCB1400 all=m
 GPIO_WHISKEY_COVE all=m
@@ -1414,6 +1418,12 @@ DRM_I2C_ADV7511 all=m
 #-
 DRM_CIRRUS_QEMU all=m
 
+#-
+#- *** FILE: drivers/gpu/drm/etnaviv/Kconfig ***
+#-
+DRM_ETNAVIV all=m
+DRM_ETNAVIV_THERMAL all=y
+
 #-
 #- *** FILE: drivers/gpu/drm/gma500/Kconfig ***
 #-
@@ -1459,6 +1469,7 @@ NOUVEAU_DEBUG all=5
 NOUVEAU_DEBUG_DEFAULT all=3
 NOUVEAU_DEBUG_MMU all=n
 DRM_NOUVEAU_BACKLIGHT all=y
+DRM_NOUVEAU_SVM all=y
 
 #-
 #- *** FILE: drivers/gpu/drm/panel/Kconfig ***
@@ -1560,6 +1571,7 @@ HID_KEYTOUCH all=m
 HID_KYE all=m
 HID_UCLOGIC all=m
 HID_WALTOP all=m
+HID_VIEWSONIC all=m
 HID_GYRATION all=m
 HID_ICADE all=m
 HID_ITE all=m
@@ -1576,6 +1588,7 @@ LOGIRUMBLEPAD2_FF all=y
 LOGIG940_FF all=y
 LOGIWHEELS_FF all=y
 HID_MAGICMOUSE all=m
+HID_MALTRON all=m
 HID_MAYFLASH all=m
 HID_REDRAGON all=m
 HID_MICROSOFT all=m
@@ -2157,7 +2170,11 @@ AD7266 all=m
 AD7291 all=m
 AD7298 all=m
 AD7476 all=m
+AD7606 all=m
+AD7606_IFACE_PARALLEL all=m
+AD7606_IFACE_SPI all=m
 AD7766 all=m
+AD7768_1 all=m
 AD7791 all=m
 AD7793 all=m
 AD7887 all=m
@@ -2221,6 +2238,9 @@ ATLAS_PH_SENSOR all=m
 BME680 all=m
 CCS811 all=m
 IAQCORE all=m
+PMS7003 all=m
+SENSIRION_SGP30 all=m
+SPS30 all=m
 VZ89X all=m
 
 #-
@@ -2274,6 +2294,7 @@ MCP4922 all=m
 TI_DAC082S085 all=m
 TI_DAC5571 all=m
 TI_DAC7311 all=m
+TI_DAC7612 all=m
 
 #-
 #- *** FILE: drivers/iio/dummy/Kconfig ***
@@ -2379,6 +2400,7 @@ SENSORS_LM3533 all=m
 LTR501 all=m
 LV0104CS all=m
 MAX44000 all=m
+MAX44009 all=m
 OPT3001 all=m
 PA12203001 all=m
 SI1133 all=m
@@ -2521,17 +2543,17 @@ INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/hw/vmw_pvrdma/Kconfig goes here
 #- file drivers/infiniband/hw/usnic/Kconfig goes here
 #- file drivers/infiniband/hw/hns/Kconfig goes here
+#- file drivers/infiniband/hw/bnxt_re/Kconfig goes here
+#- file drivers/infiniband/hw/hfi1/Kconfig goes here
+#- file drivers/infiniband/hw/qedr/Kconfig goes here
+#- file drivers/infiniband/sw/rdmavt/Kconfig goes here
+#- file drivers/infiniband/sw/rxe/Kconfig goes here
 #- file drivers/infiniband/ulp/ipoib/Kconfig goes here
 #- file drivers/infiniband/ulp/srp/Kconfig goes here
 #- file drivers/infiniband/ulp/srpt/Kconfig goes here
 #- file drivers/infiniband/ulp/iser/Kconfig goes here
 #- file drivers/infiniband/ulp/isert/Kconfig goes here
 #- file drivers/infiniband/ulp/opa_vnic/Kconfig goes here
-#- file drivers/infiniband/sw/rdmavt/Kconfig goes here
-#- file drivers/infiniband/sw/rxe/Kconfig goes here
-#- file drivers/infiniband/hw/hfi1/Kconfig goes here
-#- file drivers/infiniband/hw/qedr/Kconfig goes here
-#- file drivers/infiniband/hw/bnxt_re/Kconfig goes here
 
 #-
 #- *** FILE: drivers/infiniband/hw/bnxt_re/Kconfig ***
@@ -2778,6 +2800,7 @@ INPUT_AD714X_SPI all=m
 INPUT_ARIZONA_HAPTICS all=m
 INPUT_BMA150 all=m
 INPUT_E3X0_BUTTON all=m
+INPUT_MSM_VIBRATOR all=m
 INPUT_PCSPKR all=m
 INPUT_SPARCSPKR sparc64=m
 INPUT_MAX77693_HAPTIC all=m
@@ -3006,6 +3029,12 @@ TOUCHSCREEN_ZET6223 all=m
 TOUCHSCREEN_ZFORCE all=m
 TOUCHSCREEN_ROHM_BU21023 all=m
 
+#-
+#- *** FILE: drivers/interconnect/Kconfig ***
+#-
+INTERCONNECT all=m
+#- file drivers/interconnect/qcom/Kconfig goes here
+
 #-
 #- *** FILE: drivers/iommu/Kconfig ***
 #-
@@ -3017,6 +3046,7 @@ INTEL_IOMMU all=y
 INTEL_IOMMU_SVM all=y
 INTEL_IOMMU_DEFAULT_ON all=y
 IRQ_REMAP all=y
+HYPERV_IOMMU all=y
 
 #-
 #- *** FILE: drivers/ipack/Kconfig ***
@@ -3524,7 +3554,6 @@ VIDEO_UPD64083 all=m
 #- Audio/Video compression chips
 #- SDR tuner chips
 #- Miscellaneous helper chips
-#- file drivers/media/i2c/soc_camera/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/i2c/cx25840/Kconfig ***
@@ -3536,21 +3565,6 @@ VIDEO_CX25840 all=m
 #-
 VIDEO_M5MOLS all=m
 
-#-
-#- *** FILE: drivers/media/i2c/soc_camera/Kconfig ***
-#-
-#- soc_camera sensor drivers
-SOC_CAMERA_MT9M001 all=m
-SOC_CAMERA_MT9M111 all=m
-SOC_CAMERA_MT9T112 all=m
-SOC_CAMERA_MT9V022 all=m
-SOC_CAMERA_OV5642 all=m
-SOC_CAMERA_OV772X all=m
-SOC_CAMERA_OV9640 all=m
-SOC_CAMERA_OV9740 all=m
-SOC_CAMERA_RJ54N1 all=m
-SOC_CAMERA_TW9910 all=m
-
 #-
 #- *** FILE: drivers/media/mmc/siano/Kconfig ***
 #-
@@ -3667,6 +3681,7 @@ VIDEO_IVTV all=m sparc=n
 VIDEO_IVTV_DEPRECATED_IOCTLS all=n
 VIDEO_IVTV_ALSA all=m
 VIDEO_FB_IVTV all=m sparc=n
+VIDEO_FB_IVTV_FORCE_PAT all=y
 
 #-
 #- *** FILE: drivers/media/pci/mantis/Kconfig ***
@@ -3772,7 +3787,6 @@ VIDEO_VIA_CAMERA all=m
 #- file drivers/media/platform/davinci/Kconfig goes here
 #- file drivers/media/platform/omap/Kconfig goes here
 VIDEO_ASPEED all=m
-#- file drivers/media/platform/soc_camera/Kconfig goes here
 #- 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
@@ -3812,13 +3826,6 @@ VIDEO_CAFE_CCIC all=m sparc=n
 #-
 VIDEO_RCAR_VIN all=m
 
-#-
-#- *** FILE: drivers/media/platform/soc_camera/Kconfig ***
-#-
-SOC_CAMERA all=m
-SOC_CAMERA_PLATFORM all=m
-VIDEO_SH_MOBILE_CEU all=m
-
 #-
 #- *** FILE: drivers/media/radio/Kconfig ***
 #-
@@ -3890,6 +3897,7 @@ IR_SHARP_DECODER all=m
 IR_MCE_KBD_DECODER all=m
 IR_XMP_DECODER all=m
 IR_IMON_DECODER all=m
+IR_RCMM_DECODER all=m
 RC_DEVICES all=y
 RC_ATI_REMOTE all=m
 IR_ENE all=m
@@ -4393,6 +4401,7 @@ TWL4030_CORE powerpc=y
 MFD_WL1273_CORE all=m
 MFD_LM3533 all=m
 MFD_TIMBERDALE all=m
+MFD_TQMX86 all=m
 MFD_VX855 all=m
 MFD_ARIZONA_I2C all=m
 MFD_ARIZONA_SPI all=m
@@ -4459,6 +4468,7 @@ PVPANIC all=m
 #- file drivers/misc/cxl/Kconfig goes here
 #- file drivers/misc/ocxl/Kconfig goes here
 #- file drivers/misc/cardreader/Kconfig goes here
+#- file drivers/misc/habanalabs/Kconfig goes here
 
 #-
 #- *** FILE: drivers/misc/altera-stapl/Kconfig ***
@@ -4508,6 +4518,11 @@ EEPROM_EE1004 all=m
 GENWQE all=m
 GENWQE_PLATFORM_ERROR_RECOVERY all=0
 
+#-
+#- *** FILE: drivers/misc/habanalabs/Kconfig ***
+#-
+HABANA_AI all=m
+
 #-
 #- *** FILE: drivers/misc/lis3lv02d/Kconfig ***
 #-
@@ -4520,6 +4535,7 @@ SENSORS_LIS3_I2C all=m
 INTEL_MEI all=m
 INTEL_MEI_ME all=m
 INTEL_MEI_TXE all=m
+INTEL_MEI_HDCP all=m
 
 #-
 #- *** FILE: drivers/misc/mic/Kconfig ***
@@ -4766,8 +4782,8 @@ MTD_REDBOOT_PARTS_READONLY all=y
 #- *** FILE: drivers/mtd/spi-nor/Kconfig ***
 #-
 MTD_SPI_NOR all=m
-MTD_MT81xx_NOR all=m
 MTD_SPI_NOR_USE_4K_SECTORS all=y
+SPI_MTK_QUADSPI all=m
 SPI_INTEL_SPI_PCI all=m
 SPI_INTEL_SPI_PLATFORM all=m
 
@@ -5363,6 +5379,7 @@ FEC_MPC52xx_MDIO ppc=y
 GIANFAR ppc=m
 #- file drivers/net/ethernet/freescale/dpaa/Kconfig goes here
 #- file drivers/net/ethernet/freescale/dpaa2/Kconfig goes here
+#- file drivers/net/ethernet/freescale/enetc/Kconfig goes here
 
 #-
 #- *** FILE: drivers/net/ethernet/fujitsu/Kconfig ***
@@ -5728,6 +5745,7 @@ TEHUTI all=m
 #- *** FILE: drivers/net/ethernet/ti/Kconfig ***
 #-
 NET_VENDOR_TI all=y
+TI_CPSW_PHY_SEL all=n
 TI_CPSW_ALE all=m
 TLAN all=m sparc=n
 
@@ -6303,6 +6321,11 @@ WLAN_VENDOR_MEDIATEK all=y
 #- file drivers/net/wireless/mediatek/mt7601u/Kconfig goes here
 #- file drivers/net/wireless/mediatek/mt76/Kconfig goes here
 
+#-
+#- *** FILE: drivers/net/wireless/mediatek/mt76/mt7603/Kconfig ***
+#-
+MT7603E all=m
+
 #-
 #- *** FILE: drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig ***
 #-
@@ -6715,6 +6738,7 @@ PCIEASPM_POWER_SUPERSAVE all=n
 PCIEASPM_PERFORMANCE all=n
 PCIE_DPC all=y
 PCIE_PTM all=y
+PCIE_BW all=y
 
 #-
 #- *** FILE: drivers/pci/switch/Kconfig ***
@@ -6865,6 +6889,16 @@ CROS_EC_SPI all=m
 CROS_EC_LPC all=m
 CROS_EC_LPC_MEC all=y
 CROS_KBD_LED_BACKLIGHT all=m
+CROS_EC_LIGHTBAR all=m
+CROS_EC_DEBUGFS all=m
+CROS_EC_SYSFS all=m
+#- file drivers/platform/chrome/wilco_ec/Kconfig goes here
+
+#-
+#- *** FILE: drivers/platform/chrome/wilco_ec/Kconfig ***
+#-
+WILCO_EC all=m
+WILCO_EC_DEBUGFS all=m
 
 #-
 #- *** FILE: drivers/platform/goldfish/Kconfig ***
@@ -6968,6 +7002,7 @@ INTEL_CHTDC_TI_PWRBTN all=m
 I2C_MULTI_INSTANTIATE all=m
 INTEL_ATOMISP2_PM all=m
 HUAWEI_WMI all=m
+PCENGINES_APU2 all=m
 
 #-
 #- *** FILE: drivers/pnp/Kconfig ***
@@ -7256,6 +7291,7 @@ RTC_DRV_TEST all=m
 #- I2C RTC drivers
 RTC_DRV_88PM80X all=m
 RTC_DRV_ABB5ZES3 all=m
+RTC_DRV_ABEOZ9 all=m
 RTC_DRV_ABX80X all=m
 RTC_DRV_DS1307 all=m
 RTC_DRV_DS1307_CENTURY all=y
@@ -7283,7 +7319,9 @@ RTC_DRV_RX8010 all=m
 RTC_DRV_RX8581 all=m
 RTC_DRV_RX8025 all=m
 RTC_DRV_EM3027 all=m
+RTC_DRV_RV3028 all=m
 RTC_DRV_RV8803 all=m
+RTC_DRV_SD3078 all=m
 #- SPI RTC drivers
 RTC_DRV_M41T93 all=m
 RTC_DRV_M41T94 all=m
@@ -7348,6 +7386,7 @@ RTC_DRV_MT6397 all=m
 RTC_DRV_XGENE all=m
 #- HID Sensor RTC drivers
 RTC_DRV_HID_SENSOR_TIME all=m
+RTC_DRV_WILCO_EC all=m
 
 #-
 #- *** FILE: drivers/sbus/char/Kconfig ***
@@ -7483,7 +7522,6 @@ SCSI_VIRTIO all=m
 #- file drivers/scsi/csiostor/Kconfig goes here
 #- file drivers/scsi/pcmcia/Kconfig goes here
 #- file drivers/scsi/device_handler/Kconfig goes here
-#- file drivers/scsi/osd/Kconfig goes here
 
 #-
 #- *** FILE: drivers/scsi/aic7xxx/Kconfig.aic79xx ***
@@ -7586,14 +7624,6 @@ SCSI_MVSAS all=m
 SCSI_MVSAS_DEBUG all=n
 SCSI_MVSAS_TASKLET all=y
 
-#-
-#- *** FILE: drivers/scsi/osd/Kconfig ***
-#-
-SCSI_OSD_INITIATOR all=m
-SCSI_OSD_ULD all=m
-SCSI_OSD_DPRINT_SENSE all=1
-SCSI_OSD_DEBUG all=n
-
 #-
 #- *** FILE: drivers/scsi/pcmcia/Kconfig ***
 #-
@@ -7703,6 +7733,7 @@ SPI_DW_PCI all=m
 SPI_DW_MID_DMA all=y
 SPI_DW_MMIO all=m
 SPI_DLN2 all=m
+SPI_NXP_FLEXSPI all=m
 SPI_GPIO all=m
 SPI_LM70_LLP all=m
 SPI_MPC52xx_PSC ppc=m
@@ -7711,6 +7742,7 @@ SPI_OC_TINY all=m
 SPI_PXA2XX all=m
 SPI_ROCKCHIP all=m
 SPI_SC18IS602 all=m
+SPI_SIFIVE all=m
 SPI_MXIC all=m
 SPI_TOPCLIFF_PCH all=m
 SPI_XCOMM all=m
@@ -7758,7 +7790,6 @@ STAGING all=y
 #- file drivers/staging/vt6656/Kconfig goes here
 #- file drivers/staging/iio/Kconfig goes here
 #- file drivers/staging/sm750fb/Kconfig goes here
-#- file drivers/staging/xgifb/Kconfig goes here
 #- file drivers/staging/emxx_udc/Kconfig goes here
 #- file drivers/staging/speakup/Kconfig goes here
 #- file drivers/staging/nvec/Kconfig goes here
@@ -7782,11 +7813,12 @@ STAGING all=y
 #- file drivers/staging/vboxvideo/Kconfig goes here
 #- file drivers/staging/pi433/Kconfig goes here
 #- file drivers/staging/mt7621-pci/Kconfig goes here
+#- file drivers/staging/mt7621-pci-phy/Kconfig goes here
 #- file drivers/staging/mt7621-pinctrl/Kconfig goes here
 #- file drivers/staging/mt7621-spi/Kconfig goes here
 #- file drivers/staging/mt7621-dma/Kconfig goes here
+#- file drivers/staging/ralink-gdma/Kconfig goes here
 #- file drivers/staging/mt7621-mmc/Kconfig goes here
-#- file drivers/staging/mt7621-eth/Kconfig goes here
 #- file drivers/staging/mt7621-dts/Kconfig goes here
 #- file drivers/staging/gasket/Kconfig goes here
 #- file drivers/staging/axis-fifo/Kconfig goes here
@@ -8043,9 +8075,6 @@ ADIS16240 all=m
 #-
 #- *** FILE: drivers/staging/iio/adc/Kconfig ***
 #-
-AD7606 all=m
-AD7606_IFACE_PARALLEL all=m
-AD7606_IFACE_SPI all=m
 AD7780 all=m
 AD7816 all=m
 AD7192 all=m
@@ -8062,7 +8091,6 @@ ADT7316_I2C all=m
 #- *** FILE: drivers/staging/iio/cdc/Kconfig ***
 #-
 AD7150 all=m
-AD7152 all=m
 AD7746 all=m
 
 #-
@@ -8100,25 +8128,19 @@ STAGING_MEDIA all=y
 #- file drivers/staging/media/bcm2048/Kconfig goes here
 #- file drivers/staging/media/davinci_vpfe/Kconfig goes here
 #- file drivers/staging/media/imx/Kconfig goes here
-#- file drivers/staging/media/imx074/Kconfig goes here
-#- file drivers/staging/media/mt9t031/Kconfig goes here
 #- file drivers/staging/media/omap4iss/Kconfig goes here
 #- file drivers/staging/media/rockchip/vpu/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/ipu3/Kconfig goes here
+#- file drivers/staging/media/soc_camera/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/media/bcm2048/Kconfig ***
 #-
 I2C_BCM2048 all=m
 
-#-
-#- *** FILE: drivers/staging/media/imx074/Kconfig ***
-#-
-SOC_CAMERA_IMX074 all=m
-
 #-
 #- *** FILE: drivers/staging/media/ipu3/Kconfig ***
 #-
@@ -8129,6 +8151,17 @@ VIDEO_IPU3_IMGU all=m
 #-
 SOC_CAMERA_MT9T031 all=m
 
+#-
+#- *** FILE: drivers/staging/media/soc_camera/Kconfig ***
+#-
+SOC_CAMERA all=m
+#- soc_camera sensor drivers
+SOC_CAMERA_MT9M111 all=m
+SOC_CAMERA_MT9V022 all=m
+SOC_CAMERA_OV5642 all=m
+SOC_CAMERA_OV9740 all=m
+SOC_CAMERA_IMX074 all=m
+
 #-
 #- *** FILE: drivers/staging/media/zoran/Kconfig ***
 #-
@@ -8326,11 +8359,6 @@ WILC1000_HW_OOB_INTR all=y
 #-
 PRISM2_USB all=m
 
-#-
-#- *** FILE: drivers/staging/xgifb/Kconfig ***
-#-
-FB_XGI all=m
-
 #-
 #- *** FILE: drivers/target/Kconfig ***
 #-
@@ -8640,6 +8668,7 @@ USB_OTG_WHITELIST all=y
 USB_OTG_BLACKLIST_HUB all=n
 USB_OTG_FSM all=m
 USB_LEDS_TRIGGER_USBPORT all=m
+USB_AUTOSUSPEND_DELAY all=2
 
 #-
 #- *** FILE: drivers/usb/dwc2/Kconfig ***
@@ -8773,7 +8802,7 @@ USB_XHCI_DBGCAP all=n
 USB_EHCI_HCD all=m
 USB_EHCI_ROOT_HUB_TT all=y sparc64=n
 USB_EHCI_TT_NEWSCHED all=y
-USB_EHCI_FSL ppc=y
+USB_EHCI_FSL all=m
 USB_EHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_EHCI_MV all=y
 USB_OXU210HP_HCD all=m
@@ -9394,6 +9423,7 @@ WM8350_WATCHDOG all=m
 XILINX_WATCHDOG all=m
 ZIIRAVE_WATCHDOG all=m
 RAVE_SP_WATCHDOG all=m
+MLX_WDT all=m
 CADENCE_WATCHDOG all=m
 DW_WATCHDOG all=m
 RN5T618_WATCHDOG all=m
@@ -9501,6 +9531,7 @@ XEN_SYMS all=y
 #-
 #- *** FILE: fs/Kconfig ***
 #-
+VALIDATE_FS_PARSER all=y
 #- file fs/ext2/Kconfig goes here
 #- file fs/ext4/Kconfig goes here
 #- file fs/jbd2/Kconfig goes here
@@ -9562,9 +9593,7 @@ MISC_FILESYSTEMS all=y
 #- file fs/pstore/Kconfig goes here
 #- file fs/sysv/Kconfig goes here
 #- file fs/ufs/Kconfig goes here
-#- file fs/exofs/Kconfig goes here
 #- file fs/aufs/Kconfig goes here
-#- file fs/exofs/Kconfig.ore goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
@@ -9696,7 +9725,7 @@ CRAMFS_MTD all=y
 #-
 #- *** FILE: fs/crypto/Kconfig ***
 #-
-FS_ENCRYPTION all=m
+FS_ENCRYPTION all=y
 
 #-
 #- *** FILE: fs/dlm/Kconfig ***
@@ -9720,12 +9749,6 @@ EFIVAR_FS all=m
 #-
 EFS_FS all=m
 
-#-
-#- *** FILE: fs/exofs/Kconfig ***
-#-
-EXOFS_FS all=m
-EXOFS_DEBUG all=n
-
 #-
 #- *** FILE: fs/ext2/Kconfig ***
 #-
@@ -9744,7 +9767,6 @@ EXT4_FS all=m
 EXT4_USE_FOR_EXT2 all=y
 EXT4_FS_POSIX_ACL all=y
 EXT4_FS_SECURITY all=y
-EXT4_ENCRYPTION all=y
 EXT4_DEBUG all=n
 
 #-
@@ -9756,7 +9778,6 @@ F2FS_FS_XATTR all=y
 F2FS_FS_POSIX_ACL all=y
 F2FS_FS_SECURITY all=y
 F2FS_CHECK_FS all=y
-F2FS_FS_ENCRYPTION all=y
 F2FS_IO_TRACE all=y
 F2FS_FAULT_INJECTION all=n
 
@@ -10104,7 +10125,6 @@ UBIFS_FS_LZO all=y
 UBIFS_FS_ZLIB all=y
 UBIFS_ATIME_SUPPORT all=y
 UBIFS_FS_XATTR all=y
-UBIFS_FS_ENCRYPTION all=y
 UBIFS_FS_SECURITY all=y
 UBIFS_FS_AUTHENTICATION all=y
 
@@ -10293,6 +10313,15 @@ PREEMPT all=n
 #- *** FILE: kernel/dma/Kconfig ***
 #-
 HAS_DMA all=y
+DMA_CMA all=y
+#- Default contiguous memory area size:
+CMA_SIZE_MBYTES all=64
+CMA_SIZE_SEL_MBYTES all=y
+CMA_SIZE_SEL_PERCENTAGE all=n
+CMA_SIZE_SEL_MIN all=n
+CMA_SIZE_SEL_MAX all=n
+CMA_ALIGNMENT all=8
+DMA_API_DEBUG all=n
 
 #-
 #- *** FILE: kernel/gcov/Kconfig ***
@@ -10451,6 +10480,7 @@ STRING_SELFTEST all=n
 #- *** FILE: lib/Kconfig.debug ***
 #-
 PRINTK_TIME all=y
+PRINTK_CALLER all=y
 CONSOLE_LOGLEVEL_DEFAULT all=7
 CONSOLE_LOGLEVEL_QUIET all=4
 MESSAGE_LOGLEVEL_DEFAULT all=4
@@ -10466,7 +10496,6 @@ FRAME_WARN all=2048
 STRIP_ASM_SYMS all=y
 READABLE_ASM all=n
 UNUSED_SYMBOLS all=y
-PAGE_OWNER all=n
 #* required by oprofile
 DEBUG_FS all=y
 HEADERS_CHECK all=y
@@ -10541,7 +10570,6 @@ FAULT_INJECTION all=n
 LATENCYTOP all=n
 #- file kernel/trace/Kconfig goes here
 PROVIDE_OHCI1394_DMA_INIT all=n
-DMA_API_DEBUG all=n
 RUNTIME_TESTING_MENU all=y
 LKDTM all=m
 TEST_LIST_SORT all=n
@@ -10567,6 +10595,7 @@ TEST_HASH all=m
 TEST_IDA all=m
 TEST_PARMAN all=m
 TEST_LKM all=m
+TEST_VMALLOC all=m
 TEST_USER_COPY all=n
 TEST_BPF all=n
 FIND_BIT_BENCHMARK all=m
@@ -10577,6 +10606,7 @@ TEST_STATIC_KEYS all=m
 TEST_KMOD all=m
 TEST_MEMCAT_P all=m
 TEST_OBJAGG all=m
+TEST_STACKINIT all=m
 BUG_ON_DATA_CORRUPTION all=n
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
@@ -10682,6 +10712,7 @@ GUP_BENCHMARK all=n
 #-
 PAGE_EXTENSION all=n
 DEBUG_PAGEALLOC all=n
+PAGE_OWNER all=n
 PAGE_POISONING all=n
 DEBUG_PAGE_REF all=n
 DEBUG_RODATA_TEST all=n
@@ -10807,8 +10838,7 @@ WIRELESS all=y
 #- file net/ife/Kconfig goes here
 LWTUNNEL_BPF all=y
 DST_CACHE all=y
-NET_DEVLINK all=m
-MAY_USE_DEVLINK all=m
+NET_DEVLINK all=y
 FAILOVER all=m
 
 #-
@@ -11098,10 +11128,6 @@ NF_FLOW_TABLE_IPV4 all=m
 NF_LOG_ARP all=m
 NF_LOG_IPV4 all=m
 NF_REJECT_IPV4 all=m
-NF_NAT_IPV4 all=m
-NFT_CHAIN_NAT_IPV4 all=m
-NFT_MASQ_IPV4 all=m
-NFT_REDIR_IPV4 all=m
 NF_NAT_SNMP_BASIC all=m
 IP_NF_IPTABLES all=m
 IP_NF_MATCH_AH all=m
@@ -11164,15 +11190,11 @@ NF_SOCKET_IPV6 all=m
 NF_TPROXY_IPV6 all=m
 NF_TABLES_IPV6 all=y
 NFT_CHAIN_ROUTE_IPV6 all=m
-NFT_CHAIN_NAT_IPV6 all=m
-NFT_MASQ_IPV6 all=m
-NFT_REDIR_IPV6 all=m
 NFT_DUP_IPV6 all=m
 NFT_FIB_IPV6 all=m
 NF_FLOW_TABLE_IPV6 all=m
 NF_REJECT_IPV6 all=m
 NF_LOG_IPV6 all=m
-NF_NAT_IPV6 all=m
 IP6_NF_IPTABLES all=m
 IP6_NF_MATCH_AH all=m
 IP6_NF_MATCH_EUI64 all=m
@@ -11725,6 +11747,7 @@ X25 all=m
 #- *** FILE: net/xdp/Kconfig ***
 #-
 XDP_SOCKETS all=y
+XDP_SOCKETS_DIAG all=m
 
 #-
 #- *** FILE: net/xfrm/Kconfig ***
@@ -11750,6 +11773,8 @@ GCC_PLUGINS all=y
 GCC_PLUGIN_CYC_COMPLEXITY all=n
 GCC_PLUGIN_LATENT_ENTROPY all=n
 GCC_PLUGIN_STRUCTLEAK all=y
+GCC_PLUGIN_STRUCTLEAK_USER all=n
+GCC_PLUGIN_STRUCTLEAK_BYREF all=n
 GCC_PLUGIN_STRUCTLEAK_BYREF_ALL all=y
 GCC_PLUGIN_STRUCTLEAK_VERBOSE all=n
 GCC_PLUGIN_RANDSTRUCT all=y
@@ -11781,19 +11806,19 @@ STATIC_USERMODEHELPER all=n
 #- file security/apparmor/Kconfig goes here
 #- file security/loadpin/Kconfig goes here
 #- file security/yama/Kconfig goes here
+#- file security/safesetid/Kconfig goes here
 #- file security/integrity/Kconfig goes here
 DEFAULT_SECURITY_SELINUX all=n
 DEFAULT_SECURITY_SMACK all=n
 DEFAULT_SECURITY_TOMOYO all=n
 DEFAULT_SECURITY_APPARMOR=n
 DEFAULT_SECURITY_DAC all=y
-DEFAULT_SECURITY all=""
+LSM all="yama,loadpin,safesetid,integrity"
 
 #-
 #- *** FILE: security/apparmor/Kconfig ***
 #-
 SECURITY_APPARMOR=y
-SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 SECURITY_APPARMOR_HASH all=y
 SECURITY_APPARMOR_HASH_DEFAULT all=y
 SECURITY_APPARMOR_DEBUG all=n
@@ -11841,12 +11866,16 @@ KEY_DH_OPERATIONS all=y
 #-
 SECURITY_LOADPIN all=n
 
+#-
+#- *** FILE: security/safesetid/Kconfig ***
+#-
+SECURITY_SAFESETID all=y
+
 #-
 #- *** FILE: security/selinux/Kconfig ***
 #-
 SECURITY_SELINUX all=y
 SECURITY_SELINUX_BOOTPARAM all=y
-SECURITY_SELINUX_BOOTPARAM_VALUE all=0
 SECURITY_SELINUX_DISABLE all=n
 SECURITY_SELINUX_DEVELOP all=y
 SECURITY_SELINUX_AVC_STATS all=n
@@ -12204,6 +12233,7 @@ SND_SOC all=m
 #- file sound/soc/sh/Kconfig goes here
 #- file sound/soc/sirf/Kconfig goes here
 #- file sound/soc/spear/Kconfig goes here
+#- file sound/soc/sprd/Kconfig goes here
 #- file sound/soc/sti/Kconfig goes here
 #- file sound/soc/stm/Kconfig goes here
 #- file sound/soc/sunxi/Kconfig goes here
@@ -12252,10 +12282,12 @@ SND_SOC_AK5558 all=m
 SND_SOC_ALC5623 all=m
 SND_SOC_BD28623 all=m
 SND_SOC_BT_SCO all=m
+SND_SOC_CROS_EC_CODEC all=m
 SND_SOC_CS35L32 all=m
 SND_SOC_CS35L33 all=m
 SND_SOC_CS35L34 all=m
 SND_SOC_CS35L35 all=m
+SND_SOC_CS35L36 all=m
 SND_SOC_CS42L42 all=m
 SND_SOC_CS42L51 all=m
 SND_SOC_CS42L51_I2C all=m
@@ -12269,6 +12301,7 @@ SND_SOC_CS4271_I2C all=m
 SND_SOC_CS4271_SPI all=m
 SND_SOC_CS42XX8_I2C all=m
 SND_SOC_CS43130 all=m
+SND_SOC_CS4341 all=m
 SND_SOC_CS4349 all=m
 SND_SOC_CS53L30 all=m
 SND_SOC_ES7134 all=m
@@ -12302,6 +12335,7 @@ SND_SOC_PCM3168A_I2C all=m
 SND_SOC_PCM3168A_SPI all=m
 SND_SOC_PCM512x_I2C all=m
 SND_SOC_PCM512x_SPI all=m
+SND_SOC_RK3328 all=m
 SND_SOC_RT5616 all=m
 SND_SOC_RT5631 all=m
 SND_SOC_RT5670 all=m
@@ -12335,6 +12369,7 @@ SND_SOC_TLV320AIC3X all=m
 SND_SOC_TS3A227E all=m
 SND_SOC_TSCS42XX all=m
 SND_SOC_TSCS454 all=m
+SND_SOC_WCD9335 all=m
 SND_SOC_WM1250_EV1 all=m
 SND_SOC_WM8510 all=m
 SND_SOC_WM8523 all=m
@@ -12354,6 +12389,7 @@ SND_SOC_WM8804 all=m
 SND_SOC_WM8804_I2C all=m
 SND_SOC_WM8804_SPI all=m
 SND_SOC_WM8903 all=m
+SND_SOC_WM8904 all=m
 SND_SOC_WM8960 all=m
 SND_SOC_WM8962 all=m
 SND_SOC_WM8974 all=m
@@ -12364,6 +12400,7 @@ SND_SOC_ZX_AUD96P22 all=m
 SND_SOC_LM4857 all=m
 SND_SOC_MAX9759 all=m
 SND_SOC_MT6351 all=m
+SND_SOC_MT6358 all=m
 SND_SOC_NAU8540 all=m
 SND_SOC_NAU8810 all=m
 SND_SOC_NAU8822 all=m
@@ -12385,6 +12422,7 @@ SND_SOC_FSL_SAI all=m
 SND_SOC_FSL_SSI all=m
 SND_SOC_FSL_SPDIF all=m
 SND_SOC_FSL_ESAI all=m
+SND_SOC_FSL_MICFIL all=m
 SND_SOC_IMX_AUDMUX all=m
 #- SoC Audio support for Freescale PPC boards:
 SND_SOC_MPC5200_I2S all=m
@@ -12460,6 +12498,11 @@ SND_SOC_INTEL_KBL_RT5660_MACH all=m
 SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH all=m
 SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH all=m
 
+#-
+#- *** FILE: sound/soc/mediatek/Kconfig ***
+#-
+SND_SOC_MTK_BTCVSD all=m
+
 #-
 #- *** FILE: sound/soc/qcom/Kconfig ***
 #-
@@ -12475,6 +12518,8 @@ SND_SUN4I_I2S all=m
 #- *** FILE: sound/soc/xilinx/Kconfig ***
 #-
 SND_SOC_XILINX_I2S all=m
+SND_SOC_XILINX_AUDIO_FORMATTER all=m
+SND_SOC_XILINX_SPDIF all=m
 
 #-
 #- *** FILE: sound/soc/xtensa/Kconfig ***
@@ -12549,6 +12594,7 @@ RD_LZ4 all=y
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+AD7152 all=m
 BLK_WBT_SQ all=y
 CAPI_EICON all=y
 CFQ_GROUP_IOSCHED all=y
@@ -12556,6 +12602,13 @@ DEFAULT_CFQ all=y
 DEFAULT_DEADLINE all=n
 DEFAULT_IOSCHED all="cfq"
 DEFAULT_NOOP all=n
+DEFAULT_SECURITY all=""
+EARLY_PRINTK_EFI all=n
+EXOFS_DEBUG all=n
+EXOFS_FS all=m
+EXT4_ENCRYPTION all=y
+F2FS_FS_ENCRYPTION all=y
+FB_XGI all=m
 INTEL_RDT all=y
 IOSCHED_CFQ all=y
 IOSCHED_DEADLINE all=y
@@ -12567,11 +12620,38 @@ ISDN_DIVAS_MAINT all=m
 ISDN_DIVAS_PRIPCI all=y
 ISDN_DIVAS_USERIDI all=m
 LCD_OTM3225A all=m
+MAY_USE_DEVLINK all=m
 MICROCHIP_KSZ all=m
 MICROCHIP_KSZ_SPI_DRIVER all=m
 MTD_GPIO_ADDR all=m
 MTD_LATCH_ADDR all=m
+MTD_MT81xx_NOR all=m
 MTD_SPINAND_MT29F all=m
 MTD_SPINAND_ONDIEECC all=y
+NFT_CHAIN_NAT_IPV4 all=m
+NFT_CHAIN_NAT_IPV6 all=m
+NFT_MASQ_IPV4 all=m
+NFT_MASQ_IPV6 all=m
+NFT_REDIR_IPV4 all=m
+NFT_REDIR_IPV6 all=m
+NF_NAT_IPV4 all=m
+NF_NAT_IPV6 all=m
+PSW_PHY_SEL all=n
 QTNFMAC_PEARL_PCIE all=m
 SCSI_MQ_DEFAULT all=y
+SCSI_OSD_DEBUG all=n
+SCSI_OSD_DPRINT_SENSE all=1
+SCSI_OSD_INITIATOR all=m
+SCSI_OSD_ULD all=m
+SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+SECURITY_SELINUX_BOOTPARAM_VALUE all=0
+SOC_CAMERA_MT9M001 all=m
+SOC_CAMERA_MT9T112 all=m
+SOC_CAMERA_OV772X all=m
+SOC_CAMERA_OV9640 all=m
+SOC_CAMERA_PLATFORM all=m
+SOC_CAMERA_RJ54N1 all=m
+SOC_CAMERA_TW9910 all=m
+SUNRPC_DISABLE_INSECURE_ENCTYPES all=y
+UBIFS_FS_ENCRYPTION all=y
+VIDEO_SH_MOBILE_CEU all=m

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index b97c7aafdb86c3ebfb2d414fc39ae3dc41fbbff6..4abe5e5200ca867289d3021fad8f5a1ec7f92523 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -15,15 +15,15 @@ Signed-off-by: Shaohua Li <shli@fb.com>
 
 --- linux-4.19/fs/xfs/xfs_aops.c.org   2018-11-21 10:31:12.348955352 +0100
 +++ linux-4.19/fs/xfs/xfs_aops.c       2018-11-21 10:34:35.241764742 +0100
-@@ -613,8 +613,10 @@ xfs_add_to_ioend(
+@@ -660,8 +660,10 @@ xfs_add_to_ioend(
                        list_add(&wpc->ioend->io_list, iolist);
-               wpc->ioend = xfs_alloc_ioend(inode, wpc->io_type, offset,
-                               bdev, sector);
+               wpc->ioend = xfs_alloc_ioend(inode, wpc->fork,
+                               wpc->imap.br_state, offset, bdev, sector);
 +              wbc_init_bio(wbc, wpc->ioend->io_bio);
        }
  
 +      wbc_account_io(wbc, page, len);
-       if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff)) {
+       if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) {
                if (iop)
                        atomic_inc(&iop->write_count);
 diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c

diff --git a/kernel.spec b/kernel.spec
index 44d99b8d6f2ca5b8f754f676b20a68dfe7ff460f..e6efac71914f4d39fcc41b879751acb23d90d0bc 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,8 +68,8 @@
 %endif
 
 %define                rel             1
-%define                basever         5.0
-%define                postver         .10
+%define                basever         5.1
+%define                postver         .0
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -120,7 +120,7 @@ Epoch:              3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: 7381ce8aac80a01448e065ce795c19c0
+# Source0-md5: 15fbdff95ff98483069ac6e215b9f4f9
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
 # Patch0-md5:  a46bbfe17039c1fa81edc847af5ea664
@@ -1399,8 +1399,11 @@ fi
 %{_kernelsrcdir}/scripts/kconfig/[c-k]*.c
 %{_kernelsrcdir}/scripts/kconfig/[c-k]*.h
 %{_kernelsrcdir}/scripts/kconfig/l*.h
-%{_kernelsrcdir}/scripts/kconfig/[m-u]*.c
-%{_kernelsrcdir}/scripts/kconfig/[m-u]*.h
+%{_kernelsrcdir}/scripts/kconfig/[m-o]*.c
+%{_kernelsrcdir}/scripts/kconfig/[m-o]*.h
+%{_kernelsrcdir}/scripts/kconfig/preprocess.c
+%{_kernelsrcdir}/scripts/kconfig/[q-u]*.c
+%{_kernelsrcdir}/scripts/kconfig/[q-u]*.h
 %{_kernelsrcdir}/scripts/kconfig/lxdialog
 %{_kernelsrcdir}/scripts/mod/*.c
 %{_kernelsrcdir}/scripts/mod/modpost.h
@@ -1460,7 +1463,6 @@ fi
 %{_kernelsrcdir}/certs
 %{_kernelsrcdir}/crypto
 %{_kernelsrcdir}/drivers
-%{_kernelsrcdir}/firmware
 %{_kernelsrcdir}/fs
 %{_kernelsrcdir}/init
 %{_kernelsrcdir}/ipc