[packages/kernel] - up to 5.5.0
arekm
arekm at pld-linux.org
Mon Jan 27 13:10:56 CET 2020
commit d58c55f2695154825b83f75e1487e00ceeccdc9f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Jan 27 13:10:43 2020 +0100
- up to 5.5.0
kernel-aufs5.patch | 523 +++++++++++++++++++++++------------------------
kernel-multiarch.config | 211 +++++++++++++------
kernel-small_fixes.patch | 474 ------------------------------------------
kernel-x86.config | 5 +-
kernel.spec | 10 +-
xfs-reclaim-hack.patch | 25 +--
6 files changed, 418 insertions(+), 830 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 4a31c9b1..e6528989 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,11 +68,11 @@
%endif
%define rel 1
-%define basever 5.4
-%define postver .15
+%define basever 5.5
+%define postver .0
# define this to '-%{basever}' for longterm branch
-%define versuffix -%{basever}
+%define versuffix %{nil}
# __alt_kernel is list of features, empty string if none set
# _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -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: ce9b2d974d27408a61c53a30d3f98fb9
+# Source0-md5: 0a78b1dc48dc032fe505b170c1b92339
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
# Patch0-md5: bbb20c60fad075793e7a1be91051595e
@@ -716,7 +716,9 @@ find -name '*.py' -print0 | \
drivers/staging/greybus/tools/lbtest \
scripts/bloat-o-meter \
scripts/diffconfig \
+ scripts/jobserver-exec \
scripts/show_delta \
+ tools/hv/vmbus_testing \
tools/kvm/kvm_stat/kvm_stat
find -name '*.pl' -print0 | \
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index f7e60c9c..ad3f938c 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -1,8 +1,8 @@
SPDX-License-Identifier: GPL-2.0
-aufs5.4 kbuild patch
+aufs5.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index 2501e6f1f965..38a6a5991da9 100644
+index 7b623e9fc1b0..9070b9159188 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -264,6 +264,7 @@ source "fs/pstore/Kconfig"
@@ -14,22 +14,22 @@ index 2501e6f1f965..38a6a5991da9 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index 14231b4cf383..8765e191ebe0 100644
+index 1148c555c4d3..ed6ff7ddc478 100644
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -132,3 +132,4 @@ obj-$(CONFIG_CEPH_FS) += ceph/
+@@ -133,3 +133,4 @@ obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/
obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_EROFS_FS) += erofs/
+obj-$(CONFIG_AUFS_FS) += aufs/
SPDX-License-Identifier: GPL-2.0
-aufs5.4 base patch
+aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index 9d3a5c54a41d..f33398b47c42 100644
+index cf6ccca6e61c..c3b9b0d405fd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2832,6 +2832,19 @@ F: include/linux/audit.h
+@@ -2877,6 +2877,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
@@ -50,10 +50,10 @@ index 9d3a5c54a41d..f33398b47c42 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis at gmail.com>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index f6f77eaa7217..5e094699215e 100644
+index 739b372a5112..872e3b3a7693 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -750,6 +750,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}
@@ -79,10 +79,10 @@ index f6f77eaa7217..5e094699215e 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
-index e88cf0554e65..7ce4ccf5a51c 100644
+index b280e07e162b..046000653e4d 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1264,7 +1264,7 @@ enum d_walk_ret {
+@@ -1266,7 +1266,7 @@ enum d_walk_ret {
*
* The @enter() callbacks are called with d_lock held.
*/
@@ -92,7 +92,7 @@ index e88cf0554e65..7ce4ccf5a51c 100644
{
struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 3d40771e8e7c..12dd73930961 100644
+index 9bc167562ee8..b0935c67bd1e 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -32,7 +32,7 @@
@@ -114,10 +114,10 @@ index 3d40771e8e7c..12dd73930961 100644
return error;
diff --git a/fs/inode.c b/fs/inode.c
-index fef457a42882..aaeacde398ee 100644
+index 96d62d97694e..31796c1040d6 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -1673,7 +1673,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1680,7 +1680,7 @@ EXPORT_SYMBOL(generic_update_time);
* This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this.
*/
@@ -127,7 +127,7 @@ index fef457a42882..aaeacde398ee 100644
int (*update_time)(struct inode *, struct timespec64 *, int);
diff --git a/fs/namespace.c b/fs/namespace.c
-index 2adfe7b166a3..0f7e57e5f4b7 100644
+index 5e1bf611a9eb..c05ac2488abb 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -776,6 +776,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -177,10 +177,10 @@ index 5bbf587f5bc1..fa9b3994b34c 100644
{
mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c
-index 98412721f056..75b489fcb66f 100644
+index 3009652a41c8..d9bcc4a71a0a 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -834,8 +834,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -849,8 +849,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
/*
* Attempt to initiate a splice from pipe to file.
*/
@@ -191,7 +191,7 @@ index 98412721f056..75b489fcb66f 100644
{
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
loff_t *, size_t, unsigned int);
-@@ -851,9 +851,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -866,9 +866,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
/*
* Attempt to initiate a splice from a file to a pipe.
*/
@@ -218,7 +218,7 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644
if (wait)
sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index e0d909d35763..381a13995011 100644
+index 98e0349adb52..5fc7807f7c2e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1349,6 +1349,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -229,7 +229,7 @@ index e0d909d35763..381a13995011 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);
-@@ -1835,6 +1836,7 @@ struct file_operations {
+@@ -1842,6 +1843,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
@@ -237,7 +237,7 @@ index e0d909d35763..381a13995011 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);
-@@ -1905,6 +1907,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -1912,6 +1914,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer,
struct iovec **ret_pointer);
@@ -250,7 +250,7 @@ index e0d909d35763..381a13995011 100644
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -2325,6 +2333,7 @@ extern int current_umask(void);
+@@ -2332,6 +2340,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode);
extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int);
@@ -258,7 +258,7 @@ index e0d909d35763..381a13995011 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
-@@ -2613,6 +2622,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2620,6 +2629,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false;
}
#endif
@@ -267,7 +267,7 @@ index e0d909d35763..381a13995011 100644
extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops;
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index b8a835fd611b..f452521f2e05 100644
+index c50d01ef1414..4f4677020360 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -331,6 +331,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
@@ -279,7 +279,7 @@ index b8a835fd611b..f452521f2e05 100644
/*
* Acquire a lock.
*
-@@ -473,6 +475,7 @@ struct lockdep_map { };
+@@ -472,6 +474,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0)
@@ -322,7 +322,7 @@ index 74b4911ac16d..19789fbea567 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 233459c03b5a..407c08ac8ac8 100644
+index 32406ef0d6a2..e52169c2086b 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -153,7 +153,7 @@ static
@@ -343,7 +343,7 @@ index 233459c03b5a..407c08ac8ac8 100644
#ifdef CONFIG_LOCK_STAT
static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
SPDX-License-Identifier: GPL-2.0
-aufs5.4 mmap patch
+aufs5.x-rcN mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
index ebea9501afb8..dc7edc5f7267 100644
@@ -416,10 +416,10 @@ index 7907e6419e57..d17209cf52bc 100644
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index a2adf95b3f9c..70e1dccc1283 100644
+index cfaa8feecfe8..b66c4c536ac5 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1510,6 +1510,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1495,6 +1495,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
@@ -469,10 +469,10 @@ index 270aa8fd2800..33848c2165e2 100644
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
-index 13b38794efb5..ede7225bae95 100644
+index 080809560072..968e4dc2279f 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -562,7 +562,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -565,7 +565,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping;
@@ -482,7 +482,7 @@ index 13b38794efb5..ede7225bae95 100644
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
-index d996846697ef..fbadb91df4e4 100644
+index 1937cc251883..778c1e399903 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -42,7 +42,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
@@ -495,10 +495,10 @@ index d996846697ef..fbadb91df4e4 100644
# Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c
-index 85b7d087eb45..115275a4a0e2 100644
+index bf6aa30be58d..32ca075c0c8b 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -2696,7 +2696,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -2675,7 +2675,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
@@ -508,10 +508,10 @@ index 85b7d087eb45..115275a4a0e2 100644
if (page->mapping != inode->i_mapping) {
unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c
-index a7d8c84d19b7..9c350dc3f570 100644
+index 71e4ffc83bcd..7256e8b985eb 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
-@@ -182,7 +182,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -176,7 +176,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
@@ -520,7 +520,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
mpol_put(vma_policy(vma));
vm_area_free(vma);
return next;
-@@ -940,7 +940,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
+@@ -909,7 +909,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
if (remove_next) {
if (file) {
uprobe_munmap(next, next->vm_start, next->vm_end);
@@ -529,7 +529,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
}
if (next->anon_vma)
anon_vma_merge(vma, next);
-@@ -1865,8 +1865,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1837,8 +1837,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
return addr;
unmap_and_free_vma:
@@ -539,7 +539,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
/* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2695,7 +2695,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2667,7 +2667,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
@@ -548,7 +548,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
-@@ -2714,7 +2714,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2686,7 +2686,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new);
if (new->vm_file)
@@ -557,7 +557,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
-@@ -2906,7 +2906,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2878,7 +2878,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma;
unsigned long populate = 0;
unsigned long ret = -EINVAL;
@@ -566,7 +566,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid);
-@@ -2981,10 +2981,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2953,10 +2953,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
}
}
@@ -595,7 +595,7 @@ index a7d8c84d19b7..9c350dc3f570 100644
out:
up_write(&mm->mmap_sem);
if (populate)
-@@ -3274,7 +3291,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3247,7 +3264,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma))
goto out_free_mempol;
if (new_vma->vm_file)
@@ -605,10 +605,10 @@ index a7d8c84d19b7..9c350dc3f570 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 99b7ec318824..de5b6cd162fe 100644
+index bd2b4e5ef144..acdab5253263 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
-@@ -552,7 +552,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -563,7 +563,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);
if (region->vm_file)
@@ -617,7 +617,7 @@ index 99b7ec318824..de5b6cd162fe 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
-@@ -690,7 +690,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -695,7 +695,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
@@ -626,7 +626,7 @@ index 99b7ec318824..de5b6cd162fe 100644
put_nommu_region(vma->vm_region);
vm_area_free(vma);
}
-@@ -1213,7 +1213,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1218,7 +1218,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
@@ -635,7 +635,7 @@ index 99b7ec318824..de5b6cd162fe 100644
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
-@@ -1290,10 +1290,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1295,10 +1295,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem);
error:
if (region->vm_file)
@@ -650,7 +650,7 @@ index 99b7ec318824..de5b6cd162fe 100644
diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644
-index 000000000000..024cdcfae1b1
+index 000000000000..00d51187c325
--- /dev/null
+++ b/mm/prfile.c
@@ -0,0 +1,86 @@
@@ -662,7 +662,7 @@ index 000000000000..024cdcfae1b1
+ *
+ * See Documentation/filesystems/aufs/design/06mmap.txt
+ *
-+ * Copyright (c) 2014-2019 Junjro R. Okajima
++ * Copyright (c) 2014-2020 Junjro R. Okajima
+ * Copyright (c) 2014 Ian Campbell
+ */
+
@@ -741,13 +741,13 @@ index 000000000000..024cdcfae1b1
+}
+#endif /* !CONFIG_MMU */
SPDX-License-Identifier: GPL-2.0
-aufs5.4 standalone patch
+aufs5.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
-index 7ce4ccf5a51c..00d7e6a08026 100644
+index 046000653e4d..15aa871d1b45 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1369,6 +1369,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1371,6 +1371,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
@@ -755,7 +755,7 @@ index 7ce4ccf5a51c..00d7e6a08026 100644
struct check_mount {
struct vfsmount *mnt;
-@@ -2914,6 +2915,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2916,6 +2917,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock);
}
@@ -764,10 +764,10 @@ index 7ce4ccf5a51c..00d7e6a08026 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
-index 555e93c7dec8..dad39c6b3878 100644
+index 74d88dab98dd..71eb4fcace94 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -110,6 +110,7 @@ bool path_noexec(const struct path *path)
+@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
}
@@ -776,7 +776,7 @@ index 555e93c7dec8..dad39c6b3878 100644
#ifdef CONFIG_USELIB
/*
diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 12dd73930961..0468c845190f 100644
+index b0935c67bd1e..07251ba86c31 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg)
@@ -808,10 +808,10 @@ index 30d55c9a1744..34b9bbf4c556 100644
void __init files_init(void)
{
diff --git a/fs/inode.c b/fs/inode.c
-index aaeacde398ee..5be87f2d3828 100644
+index 31796c1040d6..217169541ac4 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -1682,6 +1682,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
+@@ -1689,6 +1689,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
return update_time(inode, time, flags);
}
@@ -820,7 +820,7 @@ index aaeacde398ee..5be87f2d3828 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
-index 0f7e57e5f4b7..516c2f397d33 100644
+index c05ac2488abb..100b7839c8b0 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -908,10 +908,10 @@ index fa9b3994b34c..eb0e2c6ebaff 100644
/* file_ppos returns &file->f_pos or NULL if file is stream */
static inline loff_t *file_ppos(struct file *file)
diff --git a/fs/splice.c b/fs/splice.c
-index 75b489fcb66f..0a1f7498c22b 100644
+index d9bcc4a71a0a..bf8725e99070 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -847,6 +847,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -862,6 +862,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
return splice_write(pipe, out, ppos, len, flags);
}
@@ -919,7 +919,7 @@ index 75b489fcb66f..0a1f7498c22b 100644
/*
* Attempt to initiate a splice from a file to a pipe.
-@@ -876,6 +877,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -891,6 +892,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return splice_read(in, ppos, pipe, len, flags);
}
@@ -952,7 +952,7 @@ index 90dd78f0eb27..40b01dd1b14a 100644
ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 407c08ac8ac8..d7f71842f8a2 100644
+index e52169c2086b..d9bc5cbe9078 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -174,6 +174,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -972,17 +972,8 @@ index 0fef395662a6..83fb1ecfc33d 100644
}
}
+EXPORT_SYMBOL_GPL(task_work_run);
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 725674f3276d..83f6494c52a2 100644
---- a/security/device_cgroup.c
-+++ b/security/device_cgroup.c
-@@ -824,3 +824,4 @@ int __devcgroup_check_permission(short type, u32 major, u32 minor,
-
- return 0;
- }
-+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c
-index 1bc000f834e2..306f2c9f7ee2 100644
+index cd2d18d2d279..fbf716450399 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1036,6 +1036,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
@@ -1145,10 +1136,10 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentat
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt 2019-07-11 15:42:14.455570938 +0200
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2020-01-27 10:57:18.162204582 +0100
@@ -0,0 +1,171 @@
+
-+# Copyright (C) 2005-2019 Junjiro R. Okajima
++# Copyright (C) 2005-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1320,10 +1311,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt lin
+about it. But currently I have implemented it in kernel space.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt 2019-07-11 15:42:14.455570938 +0200
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2020-01-27 10:57:18.162204582 +0100
@@ -0,0 +1,258 @@
+
-+# Copyright (C) 2005-2019 Junjiro R. Okajima
++# Copyright (C) 2005-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1582,10 +1573,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt li
+For this purpose, use "aumvdown" command in aufs-util.git.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt linux/Documentation/filesystems/aufs/design/03atomic_open.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2020-01-27 10:57:18.162204582 +0100
@@ -0,0 +1,85 @@
+
-+# Copyright (C) 2015-2019 Junjiro R. Okajima
++# Copyright (C) 2015-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1671,10 +1662,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.t
+ be implemented in aufs, but not all I am afraid.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,113 @@
+
-+# Copyright (C) 2005-2019 Junjiro R. Okajima
++# Copyright (C) 2005-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1788,10 +1779,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt li
+ by over-mounting something (or another method).
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,74 @@
+
-+# Copyright (C) 2005-2019 Junjiro R. Okajima
++# Copyright (C) 2005-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1866,10 +1857,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt li
+ same named entry on the upper branch.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,64 @@
+
-+# Copyright (C) 2005-2019 Junjiro R. Okajima
++# Copyright (C) 2005-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1969,10 +1960,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot li
+}
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt linux/Documentation/filesystems/aufs/design/06dirren.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,102 @@
+
-+# Copyright (C) 2017-2019 Junjiro R. Okajima
++# Copyright (C) 2017-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2075,10 +2066,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt li
+equivalen to udba=reval case.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linux/Documentation/filesystems/aufs/design/06fhsm.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,120 @@
+
-+# Copyright (C) 2011-2019 Junjiro R. Okajima
++# Copyright (C) 2011-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2199,10 +2190,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linu
+should restore the original file state after an error happens.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,72 @@
+
-+# Copyright (C) 2005-2019 Junjiro R. Okajima
++# Copyright (C) 2005-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2275,10 +2266,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linu
+I have to give up this "looks-smater" approach.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt linux/Documentation/filesystems/aufs/design/06xattr.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,96 @@
+
-+# Copyright (C) 2014-2019 Junjiro R. Okajima
++# Copyright (C) 2014-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2375,10 +2366,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt lin
+now, aufs implements the branch attributes to ignore the error.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,58 @@
+
-+# Copyright (C) 2005-2019 Junjiro R. Okajima
++# Copyright (C) 2005-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2437,10 +2428,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt li
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,52 @@
+
-+# Copyright (C) 2005-2019 Junjiro R. Okajima
++# Copyright (C) 2005-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2493,10 +2484,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linu
+initramfs will use it to replace the old one at the next boot.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2019-07-11 15:42:14.458904362 +0200
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,47 @@
+
-+# Copyright (C) 2010-2019 Junjiro R. Okajima
++# Copyright (C) 2010-2020 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -2949,11 +2940,11 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta
+# End: ;
diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
--- /usr/share/empty/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/aufs.h 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -3015,11 +3006,11 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
+#endif /* __AUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
--- /usr/share/empty/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c 2019-09-16 09:38:43.216175640 +0200
++++ linux/fs/aufs/branch.c 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,1428 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4447,11 +4438,11 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
+}
diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
--- /usr/share/empty/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.h 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/branch.h 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,366 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4861,11 +4852,11 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
+-include ${srctree}/${src}/conf_priv.mk
diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
--- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/cpup.c 2020-01-27 10:57:18.165538015 +0100
@@ -0,0 +1,1458 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6323,11 +6314,11 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
+}
diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
--- /usr/share/empty/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/cpup.h 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,100 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6427,11 +6418,11 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
+#endif /* __AUFS_CPUP_H__ */
diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
--- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dbgaufs.c 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,526 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6957,11 +6948,11 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
+}
diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
--- /usr/share/empty/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.h 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dbgaufs.h 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7014,11 +7005,11 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
+#endif /* __DBGAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
--- /usr/share/empty/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.c 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dcsub.c 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7243,11 +7234,11 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
+}
diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
--- /usr/share/empty/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.h 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dcsub.h 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,137 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7384,11 +7375,11 @@ 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-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/debug.c 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,441 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7829,11 +7820,11 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
+}
diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
--- /usr/share/empty/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.h 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/debug.h 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -8059,11 +8050,11 @@ 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-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dentry.c 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,1154 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -9217,11 +9208,11 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
+};
diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
--- /usr/share/empty/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dentry.h 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,268 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -9489,11 +9480,11 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
+#endif /* __AUFS_DENTRY_H__ */
diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
--- /usr/share/empty/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dinfo.c 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dinfo.c 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,554 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10047,11 +10038,11 @@ 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-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dir.c 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,763 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10814,11 +10805,11 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
+};
diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
--- /usr/share/empty/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.h 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dir.h 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,134 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10952,11 +10943,11 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
+#endif /* __AUFS_DIR_H__ */
diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
--- /usr/share/empty/fs/aufs/dirren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.c 2020-01-23 09:59:36.748660743 +0100
++++ linux/fs/aufs/dirren.c 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,1316 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2017-2019 Junjiro R. Okajima
++ * Copyright (C) 2017-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12272,11 +12263,11 @@ diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
+}
diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
--- /usr/share/empty/fs/aufs/dirren.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.h 2019-07-11 15:42:14.462237786 +0200
++++ linux/fs/aufs/dirren.h 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2017-2019 Junjiro R. Okajima
++ * Copyright (C) 2017-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12416,11 +12407,11 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
+#endif /* __AUFS_DIRREN_H__ */
diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
--- /usr/share/empty/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/dynop.c 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,367 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2010-2019 Junjiro R. Okajima
++ * Copyright (C) 2010-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12787,11 +12778,11 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
+}
diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
--- /usr/share/empty/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.h 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/dynop.h 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2010-2019 Junjiro R. Okajima
++ * Copyright (C) 2010-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12868,11 +12859,11 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
+#endif /* __AUFS_DYNOP_H__ */
diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
--- /usr/share/empty/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/export.c 2020-01-27 10:57:18.168871450 +0100
@@ -0,0 +1,838 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -13710,11 +13701,11 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
+}
diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
--- /usr/share/empty/fs/aufs/fhsm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fhsm.c 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/fhsm.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2011-2019 Junjiro R. Okajima
++ * Copyright (C) 2011-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -14141,11 +14132,11 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
+}
diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
--- /usr/share/empty/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/file.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,863 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -15008,11 +14999,11 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
+};
diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
--- /usr/share/empty/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.h 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/file.h 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,342 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -15354,11 +15345,11 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
+#endif /* __AUFS_FILE_H__ */
diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
--- /usr/share/empty/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/finfo.c 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/finfo.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -15507,11 +15498,11 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
+}
diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
--- /usr/share/empty/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c 2020-01-23 09:59:36.748660743 +0100
++++ linux/fs/aufs/f_op.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,819 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16330,11 +16321,11 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
+};
diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
--- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/fstype.h 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,401 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16735,11 +16726,11 @@ diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
+#endif /* __AUFS_FSTYPE_H__ */
diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h
--- /usr/share/empty/fs/aufs/hbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hbl.h 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/hbl.h 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2017-2019 Junjiro R. Okajima
++ * Copyright (C) 2017-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16804,11 +16795,11 @@ diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h
+#endif /* __AUFS_HBL_H__ */
diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
--- /usr/share/empty/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsnotify.c 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/hfsnotify.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,288 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -17096,11 +17087,11 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
+};
diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
--- /usr/share/empty/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsplus.c 2019-07-11 15:42:14.465571210 +0200
++++ linux/fs/aufs/hfsplus.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2010-2019 Junjiro R. Okajima
++ * Copyright (C) 2010-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -17160,11 +17151,11 @@ 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 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/hnotify.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,715 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -17879,11 +17870,11 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
+}
diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
--- /usr/share/empty/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/iinfo.c 2019-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/iinfo.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,286 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -18169,11 +18160,11 @@ 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 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/inode.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,529 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -18702,11 +18693,11 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/inode.h 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,698 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -19404,11 +19395,11 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
+#endif /* __AUFS_INODE_H__ */
diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
--- /usr/share/empty/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c 2019-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/ioctl.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,220 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -19628,11 +19619,11 @@ 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-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/i_op_add.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,936 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -20568,11 +20559,11 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2020-01-23 09:59:57.545973984 +0100
++++ linux/fs/aufs/i_op.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,1498 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -21221,7 +21212,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
+{
+ if (p->hdir) {
+ au_pin_hdir_set_owner(p, p->task);
-+ rwsem_release(&p->hdir->hi_inode->i_rwsem.dep_map, 1, _RET_IP_);
++ rwsem_release(&p->hdir->hi_inode->i_rwsem.dep_map, _RET_IP_);
+ }
+}
+
@@ -22070,11 +22061,11 @@ 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-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/i_op_del.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,513 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22587,11 +22578,11 @@ 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 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/i_op_ren.c 2020-01-27 10:57:18.172204883 +0100
@@ -0,0 +1,1250 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24044,11 +24035,11 @@ diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
+endif
diff -urN /usr/share/empty/fs/aufs/lcnt.h linux/fs/aufs/lcnt.h
--- /usr/share/empty/fs/aufs/lcnt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/lcnt.h 2019-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/lcnt.h 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,186 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2018-2019 Junjiro R. Okajima
++ * Copyright (C) 2018-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24234,11 +24225,11 @@ diff -urN /usr/share/empty/fs/aufs/lcnt.h linux/fs/aufs/lcnt.h
+#endif /* __AUFS_LCNT_H__ */
diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
--- /usr/share/empty/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.c 2019-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/loop.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24386,11 +24377,11 @@ 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-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/loop.h 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24530,11 +24521,11 @@ diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
--- /usr/share/empty/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c 2019-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/module.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24807,11 +24798,11 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
+module_exit(aufs_exit);
diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
--- /usr/share/empty/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h 2019-07-11 15:42:14.468904634 +0200
++++ linux/fs/aufs/module.h 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,166 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24977,11 +24968,11 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
+#endif /* __AUFS_MODULE_H__ */
diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
--- /usr/share/empty/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c 2019-07-11 15:42:14.472238057 +0200
++++ linux/fs/aufs/mvdown.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,706 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2011-2019 Junjiro R. Okajima
++ * Copyright (C) 2011-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -25687,11 +25678,11 @@ diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
--- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/opts.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,1880 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -27571,11 +27562,11 @@ 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-07-11 15:42:14.472238057 +0200
++++ linux/fs/aufs/opts.h 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,225 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -27800,11 +27791,11 @@ diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
+#endif /* __AUFS_OPTS_H__ */
diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
--- /usr/share/empty/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/plink.c 2019-07-11 15:42:14.472238057 +0200
++++ linux/fs/aufs/plink.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,516 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28320,11 +28311,11 @@ diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
+}
diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
--- /usr/share/empty/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/poll.c 2019-07-11 15:42:14.472238057 +0200
++++ linux/fs/aufs/poll.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28375,11 +28366,11 @@ diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
+}
diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
--- /usr/share/empty/fs/aufs/posix_acl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/posix_acl.c 2019-11-25 12:42:00.275843147 +0100
++++ linux/fs/aufs/posix_acl.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2014-2019 Junjiro R. Okajima
++ * Copyright (C) 2014-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28484,11 +28475,11 @@ diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
+}
diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
--- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c 2019-07-11 15:42:14.472238057 +0200
++++ linux/fs/aufs/procfs.c 2020-01-27 10:57:18.175538316 +0100
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2010-2019 Junjiro R. Okajima
++ * Copyright (C) 2010-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28659,11 +28650,11 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
+}
diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
--- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c 2019-07-11 15:42:14.472238057 +0200
++++ linux/fs/aufs/rdu.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,384 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -29047,11 +29038,11 @@ diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
+#endif
diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
--- /usr/share/empty/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h 2019-07-11 15:42:14.472238057 +0200
++++ linux/fs/aufs/rwsem.h 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,73 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -29124,11 +29115,11 @@ 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-07-11 15:42:14.472238057 +0200
++++ linux/fs/aufs/sbinfo.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,314 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -29442,11 +29433,11 @@ 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 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/super.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,1047 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -30493,11 +30484,11 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/super.h 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,589 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31086,11 +31077,11 @@ diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
+#endif /* __AUFS_SUPER_H__ */
diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
--- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c 2019-07-11 15:42:14.472238057 +0200
++++ linux/fs/aufs/sysaufs.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31183,11 +31174,11 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
+}
diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
--- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.h 2019-07-11 15:42:14.475571481 +0200
++++ linux/fs/aufs/sysaufs.h 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31289,11 +31280,11 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
+#endif /* __SYSAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
--- /usr/share/empty/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysfs.c 2019-07-11 15:42:14.475571481 +0200
++++ linux/fs/aufs/sysfs.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,374 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31667,11 +31658,11 @@ diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
+}
diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
--- /usr/share/empty/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysrq.c 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/sysrq.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -31820,11 +31811,11 @@ 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 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/vdir.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,896 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -32720,11 +32711,11 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2019-07-11 15:42:14.475571481 +0200
++++ linux/fs/aufs/vfsub.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,902 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -33626,11 +33617,11 @@ 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-07-11 15:42:14.475571481 +0200
++++ linux/fs/aufs/vfsub.h 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,354 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -33984,11 +33975,11 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2019-07-11 15:42:14.475571481 +0200
++++ linux/fs/aufs/wbr_policy.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -34818,11 +34809,11 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
+};
diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/whout.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,1062 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -35884,11 +35875,11 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
+}
diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
--- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h 2019-07-11 15:42:14.475571481 +0200
++++ linux/fs/aufs/whout.h 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,86 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -35974,11 +35965,11 @@ diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
+#endif /* __AUFS_WHOUT_H__ */
diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
--- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c 2020-01-23 09:59:57.545973984 +0100
++++ linux/fs/aufs/wkq.c 2020-01-27 10:57:18.178871751 +0100
@@ -0,0 +1,372 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -36183,7 +36174,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
+ if (!hl)
+ return;
+ while ((p = *hl++)) /* assignment */
-+ rwsem_release(p->instance, 0, /*p->acquire_ip*/_RET_IP_);
++ rwsem_release(p->instance, /*p->acquire_ip*/_RET_IP_);
+}
+#endif
+
@@ -36350,11 +36341,11 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
+}
diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
--- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h 2019-07-11 15:42:14.475571481 +0200
++++ linux/fs/aufs/wkq.h 2020-01-27 10:57:18.182205184 +0100
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -36443,11 +36434,11 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
+#endif /* __AUFS_WKQ_H__ */
diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
--- /usr/share/empty/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c 2019-07-11 15:42:14.475571481 +0200
++++ linux/fs/aufs/xattr.c 2020-01-27 10:57:18.182205184 +0100
@@ -0,0 +1,356 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2014-2019 Junjiro R. Okajima
++ * Copyright (C) 2014-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -36803,11 +36794,11 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
+}
diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
--- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c 2020-01-23 09:59:36.751994179 +0100
++++ linux/fs/aufs/xino.c 2020-01-27 10:57:18.182205184 +0100
@@ -0,0 +1,1965 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -38772,11 +38763,11 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
+}
diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h 2020-01-23 09:59:57.545973984 +0100
++++ linux/include/uapi/linux/aufs_type.h 2020-01-27 10:57:18.182205184 +0100
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
-+ * Copyright (C) 2005-2019 Junjiro R. Okajima
++ * Copyright (C) 2005-2020 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -38816,7 +38807,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+#include <limits.h>
+#endif /* __KERNEL__ */
+
-+#define AUFS_VERSION "5.4-20200120"
++#define AUFS_VERSION "5.x-rcN-20200127"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39227,13 +39218,13 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+
+#endif /* __AUFS_TYPE_H__ */
SPDX-License-Identifier: GPL-2.0
-aufs5.4 loopback patch
+aufs5.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 5e094699215e..22b2ecb6cfe8 100644
+index 872e3b3a7693..768100025129 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -625,6 +625,15 @@ static inline void loop_update_dio(struct loop_device *lo)
+@@ -635,6 +635,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio);
}
@@ -39249,7 +39240,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
static void loop_reread_partitions(struct loop_device *lo,
struct block_device *bdev)
{
-@@ -678,6 +687,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -690,6 +699,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
unsigned int arg)
{
struct file *file = NULL, *old_file;
@@ -39257,7 +39248,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
int error;
bool partscan;
-@@ -697,12 +707,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -709,12 +719,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
file = fget(arg);
if (!file)
goto out_err;
@@ -39277,7 +39268,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
error = -EINVAL;
-@@ -714,6 +731,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -726,6 +743,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;
@@ -39285,7 +39276,7 @@ index 5e094699215e..22b2ecb6cfe8 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));
-@@ -727,6 +745,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -739,6 +757,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
@@ -39294,7 +39285,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
if (partscan)
loop_reread_partitions(lo, bdev);
return 0;
-@@ -735,6 +755,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -747,6 +767,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
mutex_unlock(&loop_ctl_mutex);
if (file)
fput(file);
@@ -39303,7 +39294,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
return error;
}
-@@ -939,7 +961,7 @@ static void loop_update_rotational(struct loop_device *lo)
+@@ -951,7 +973,7 @@ static void loop_update_rotational(struct loop_device *lo)
static int loop_set_fd(struct loop_device *lo, fmode_t mode,
struct block_device *bdev, unsigned int arg)
{
@@ -39312,7 +39303,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
struct inode *inode;
struct address_space *mapping;
struct block_device *claimed_bdev = NULL;
-@@ -955,6 +977,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -967,6 +989,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
file = fget(arg);
if (!file)
goto out;
@@ -39325,7 +39316,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
-@@ -1003,6 +1031,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -1015,6 +1043,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
lo->lo_device = bdev;
lo->lo_flags = lo_flags;
lo->lo_backing_file = file;
@@ -39333,7 +39324,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
lo->transfer = NULL;
lo->ioctl = NULL;
lo->lo_sizelimit = 0;
-@@ -1056,6 +1085,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -1068,6 +1097,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
bd_abort_claiming(bdev, claimed_bdev, loop_set_fd);
out_putf:
fput(file);
@@ -39342,7 +39333,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
-@@ -1102,6 +1133,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
+@@ -1114,6 +1145,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
static int __loop_clr_fd(struct loop_device *lo, bool release)
{
struct file *filp = NULL;
@@ -39350,7 +39341,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
-@@ -1125,6 +1157,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1137,6 +1169,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock);
lo->lo_backing_file = NULL;
@@ -39358,7 +39349,7 @@ index 5e094699215e..22b2ecb6cfe8 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
-@@ -1207,6 +1240,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1220,6 +1253,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
@@ -39381,7 +39372,7 @@ index af75a5ee4094..1d847cb194ff 100644
void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 240509add504..ae374ce4ded7 100644
+index 6fb4a4ed8cc7..ba9a959f2db2 100644
--- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c
@@ -359,7 +359,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
@@ -39394,7 +39385,7 @@ index 240509add504..ae374ce4ded7 100644
if (file->f_mapping != h_file->f_mapping) {
file->f_mapping = h_file->f_mapping;
diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
-index 9ba35a878ecd..4ed0ff03d5ab 100644
+index a8b63acc6204..9d97c3af5686 100644
--- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c
@@ -133,3 +133,19 @@ void au_loopback_fin(void)
@@ -39418,7 +39409,7 @@ index 9ba35a878ecd..4ed0ff03d5ab 100644
+ return f;
+}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index f31e40aff267..e13fb1a0717a 100644
+index 94f4f80ae33b..ca1194354aff 100644
--- a/fs/aufs/loop.h
+++ b/fs/aufs/loop.h
@@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
@@ -39440,7 +39431,7 @@ index f31e40aff267..e13fb1a0717a 100644
#endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index 95df083a5888..2db407f441fe 100644
+index 589dd0122020..801e0a7faec5 100644
--- a/fs/aufs/super.c
+++ b/fs/aufs/super.c
@@ -844,7 +844,10 @@ static const struct super_operations aufs_sop = {
@@ -39456,10 +39447,10 @@ index 95df083a5888..2db407f441fe 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 381a13995011..215b76e0f9dc 100644
+index 5fc7807f7c2e..07e24e72706e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1973,6 +1973,10 @@ struct super_operations {
+@@ -1980,6 +1980,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 9bc8e9e1..4779a7a9 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -4,6 +4,7 @@
#-
ACRN_GUEST all=y
ARCH_MEMORY_PROBE all=n
+COMPAT_32BIT_TIME all=y
DEBUG_ENTRY all=n
DEBUG_IMR_SELFTEST all=n
DEBUG_WX all=y
@@ -29,7 +30,6 @@ PUNIT_ATOM_DEBUG all=m
RANDOMIZE_MEMORY all=y
RAS_CEC all=y
RAS_CEC_DEBUG all=n
-REFCOUNT_FULL all=n
SCHED_MC_PRIO all=y
STACKPROTECTOR all=y
STACKPROTECTOR_STRONG all=y
@@ -129,7 +129,6 @@ CRYPTO all=y
CRYPTO_FIPS all=y
CRYPTO_ALGAPI all=y
CRYPTO_AEAD all=m
-CRYPTO_BLKCIPHER all=y
CRYPTO_HASH all=y
CRYPTO_AKCIPHER all=y
CRYPTO_MANAGER all=y
@@ -146,6 +145,8 @@ CRYPTO_RSA all=y
CRYPTO_DH all=y
CRYPTO_ECDH all=m
CRYPTO_ECRDSA all=m
+CRYPTO_CURVE25519 all=m
+CRYPTO_CURVE25519_X86 all=m
#- Authenticated Encryption with Associated Data
CRYPTO_CCM all=m
CRYPTO_GCM all=m
@@ -180,6 +181,9 @@ CRYPTO_CRC32C_INTEL all=m
CRYPTO_CRC32 all=m
CRYPTO_CRC32_PCLMUL all=m
CRYPTO_XXHASH all=m
+CRYPTO_BLAKE2B all=m
+CRYPTO_BLAKE2S all=m
+CRYPTO_BLAKE2S_X86 all=m
CRYPTO_CRCT10DIF all=y
CRYPTO_CRCT10DIF_PCLMUL all=m
CRYPTO_GHASH all=m
@@ -259,6 +263,7 @@ CRYPTO_USER_API_SKCIPHER all=m
CRYPTO_USER_API_RNG all=m
CRYPTO_USER_API_AEAD all=m
CRYPTO_STATS all=y
+#- file lib/crypto/Kconfig goes here
#- file drivers/crypto/Kconfig goes here
#- file crypto/asymmetric_keys/Kconfig goes here
#- file certs/Kconfig goes here
@@ -304,7 +309,6 @@ ACPI_IPMI all=m
ACPI_HOTPLUG_CPU all=y
ACPI_PROCESSOR_AGGREGATOR all=m
ACPI_THERMAL all=m
-ACPI_NUMA ia64=y x86_64=y
ACPI_CUSTOM_DSDT_FILE all=""
ACPI_CUSTOM_DSDT all=n
ACPI_TABLE_UPGRADE all=y
@@ -315,7 +319,7 @@ ACPI_SBS x86=m
ACPI_CUSTOM_METHOD all=m
ACPI_BGRT all=y
#- file drivers/acpi/nfit/Kconfig goes here
-#- file drivers/acpi/hmat/Kconfig goes here
+#- file drivers/acpi/numa/Kconfig goes here
#- file drivers/acpi/apei/Kconfig goes here
#- file drivers/acpi/dptf/Kconfig goes here
ACPI_EXTLOG all=m
@@ -342,17 +346,18 @@ ACPI_APEI_ERST_DEBUG all=m
#-
DPTF_POWER all=m
-#-
-#- *** FILE: drivers/acpi/hmat/Kconfig ***
-#-
-ACPI_HMAT all=y
-
#-
#- *** FILE: drivers/acpi/nfit/Kconfig ***
#-
ACPI_NFIT all=m
NFIT_SECURITY_DEBUG all=n
+#-
+#- *** FILE: drivers/acpi/numa/Kconfig ***
+#-
+ACPI_NUMA ia64=y x86_64=y
+ACPI_HMAT all=y
+
#-
#- *** FILE: drivers/android/Kconfig ***
#-
@@ -525,6 +530,7 @@ DEV_COREDUMP all=y
DEBUG_DRIVER all=n
DEBUG_DEVRES all=n
DEBUG_TEST_DRIVER_REMOVE all=n
+PM_QOS_KUNIT_TEST all=y
#- file drivers/base/test/Kconfig goes here
#- file drivers/base/regmap/Kconfig goes here
DMA_FENCE_TRACE all=n
@@ -536,6 +542,7 @@ EXTRA_FIRMWARE all=""
FW_LOADER_USER_HELPER all=y
FW_LOADER_USER_HELPER_FALLBACK all=n
FW_LOADER_COMPRESS all=y
+FW_CACHE all=y
#-
#- *** FILE: drivers/base/regmap/Kconfig ***
@@ -674,7 +681,6 @@ BT_HCIVHCI all=m
BT_MRVL all=m
BT_MRVL_SDIO all=m
BT_ATH3K all=m
-BT_WILINK all=m
BT_MTKSDIO all=m
BT_MTKUART all=m
@@ -792,6 +798,7 @@ HW_RANDOM_TPM all=y
#* TCG_TIS forced to 'y' by IMA
TCG_TIS all=m x86=y ia64=y
TCG_TIS_SPI all=m
+TCG_TIS_SPI_CR50 all=y
TCG_TIS_I2C_ATMEL all=m
TCG_TIS_I2C_INFINEON all=m
TCG_TIS_I2C_NUVOTON all=m
@@ -928,6 +935,7 @@ HALTPOLL_CPUIDLE all=m
#- *** FILE: drivers/crypto/Kconfig ***
#-
CRYPTO_HW all=y
+#- file drivers/crypto/allwinner/Kconfig goes here
CRYPTO_DEV_PADLOCK all=m
CRYPTO_DEV_PADLOCK_AES all=m
CRYPTO_DEV_PADLOCK_SHA all=m
@@ -951,6 +959,13 @@ CRYPTO_DEV_CCP all=y
#- file drivers/crypto/stm32/Kconfig goes here
CRYPTO_DEV_SAFEXCEL all=m
#- file drivers/crypto/hisilicon/Kconfig goes here
+#- file drivers/crypto/amlogic/Kconfig goes here
+
+#-
+#- *** FILE: drivers/crypto/amlogic/Kconfig ***
+#-
+CRYPTO_DEV_AMLOGIC_GXL all=m
+CRYPTO_DEV_AMLOGIC_GXL_DEBUG all=n
#-
#- *** FILE: drivers/crypto/cavium/nitrox/Kconfig ***
@@ -993,6 +1008,7 @@ CRYPTO_DEV_VIRTIO all=m
#-
DEV_DAX all=m
DEV_DAX_PMEM all=m
+DEV_DAX_HMEM all=m
DEV_DAX_KMEM all=m
DEV_DAX_PMEM_COMPAT all=m
@@ -1042,8 +1058,10 @@ TIMB_DMA all=m
#- file drivers/dma/dw/Kconfig goes here
#- file drivers/dma/dw-edma/Kconfig goes here
#- file drivers/dma/hsu/Kconfig goes here
+#- file drivers/dma/sf-pdma/Kconfig goes here
#- file drivers/dma/sh/Kconfig goes here
#- file drivers/dma/ti/Kconfig goes here
+#- file drivers/dma/fsl-dpaa2-qdma/Kconfig goes here
#- DMA Clients
ASYNC_TX_DMA all=y
DMATEST all=n
@@ -1072,6 +1090,11 @@ HSU_DMA_PCI all=m
QCOM_HIDMA_MGMT all=m
QCOM_HIDMA all=m
+#-
+#- *** FILE: drivers/dma/sf-pdma/Kconfig ***
+#-
+SF_PDMA all=m
+
#-
#- *** FILE: drivers/edac/Kconfig ***
#-
@@ -1177,6 +1200,7 @@ EFI_VARS_PSTORE all=m
EFI_VARS_PSTORE_DEFAULT_DISABLE all=n
EFI_RUNTIME_MAP all=y
EFI_FAKE_MEMMAP all=n
+EFI_SOFT_RESERVE all=y
EFI_BOOTLOADER_CONTROL all=m
EFI_CAPSULE_LOADER all=m
EFI_TEST all=m
@@ -1414,6 +1438,7 @@ DRM_AMD_DC_DCN1_0 all=y
DRM_AMD_DC_DCN2_0 all=y
DRM_AMD_DC_DCN2_1 all=y
DRM_AMD_DC_DSC_SUPPORT all=y
+DRM_AMD_DC_HDCP all=y
DEBUG_KERNEL_DC all=n
#-
@@ -1483,6 +1508,7 @@ DRM_I915_GVT all=y
DRM_I915_GVT_KVMGT all=m
#- file drivers/gpu/drm/i915/Kconfig.debug goes here
#- file drivers/gpu/drm/i915/Kconfig.profile goes here
+#- file drivers/gpu/drm/i915/Kconfig.unstable goes here
#-
#- *** FILE: drivers/gpu/drm/mgag200/Kconfig ***
@@ -1787,6 +1813,8 @@ SENSORS_JC42 all=m
SENSORS_POWR1220 all=m
SENSORS_LINEAGE all=m
SENSORS_LTC2945 all=m
+SENSORS_LTC2947_I2C all=m
+SENSORS_LTC2947_SPI all=m
SENSORS_LTC2990 all=m
SENSORS_LTC4151 all=m
SENSORS_LTC4215 all=m
@@ -1868,6 +1896,7 @@ SENSORS_TMP103 all=m
SENSORS_TMP108 all=m
SENSORS_TMP401 all=m
SENSORS_TMP421 all=m
+SENSORS_TMP513 all=m
SENSORS_VIA_CPUTEMP all=m
SENSORS_VIA686A all=m
SENSORS_VT1211 all=m
@@ -1902,6 +1931,7 @@ SENSORS_OCC_P8_I2C all=m
PMBUS all=m
SENSORS_PMBUS all=m
SENSORS_ADM1275 all=m
+SENSORS_BEL_PFE all=m
SENSORS_IBM_CFFPS all=m
SENSORS_INSPUR_IPSPS all=m
SENSORS_IR35221 all=m
@@ -2213,9 +2243,11 @@ STK8BA50 all=m
#-
#- *** FILE: drivers/iio/adc/Kconfig ***
#-
+AB8500_GPADC all=y
AD7124 all=m
AD7266 all=m
AD7291 all=m
+AD7292 all=m
AD7298 all=m
AD7476 all=m
AD7606 all=m
@@ -2398,6 +2430,8 @@ ADIS16400 all=m
ADIS16460 all=m
ADIS16480 all=m
#- file drivers/iio/imu/bmi160/Kconfig goes here
+FXOS8700_I2C all=m
+FXOS8700_SPI all=m
KMX61 all=m
#- file drivers/iio/imu/inv_mpu6050/Kconfig goes here
#- file drivers/iio/imu/st_lsm6dsx/Kconfig goes here
@@ -2427,6 +2461,7 @@ IIO_ST_LSM6DSX_SPI all=m
#-
ACPI_ALS all=m
ADJD_S311 all=m
+ADUX1020 all=m
AL3320A all=m
APDS9300 all=m
APDS9960 all=m
@@ -2466,6 +2501,7 @@ TSL4531 all=m
US5182D all=m
VCNL4000 all=m
VCNL4035 all=m
+VEML6030 all=m
VEML6070 all=m
VL6180 all=m
ZOPT2201 all=m
@@ -2557,6 +2593,7 @@ AD2S1200 all=m
#-
#- *** FILE: drivers/iio/temperature/Kconfig ***
#-
+LTC2983 all=m
MAXIM_THERMOCOUPLE all=m
HID_SENSOR_TEMP all=m
MLX90614 all=m
@@ -2587,7 +2624,6 @@ INFINIBAND_ON_DEMAND_PAGING all=y
INFINIBAND_ADDR_TRANS all=y sparc=
#- file drivers/infiniband/hw/mthca/Kconfig goes here
#- file drivers/infiniband/hw/qib/Kconfig goes here
-#- file drivers/infiniband/hw/cxgb3/Kconfig goes here
#- file drivers/infiniband/hw/cxgb4/Kconfig goes here
#- file drivers/infiniband/hw/efa/Kconfig goes here
#- file drivers/infiniband/hw/i40iw/Kconfig goes here
@@ -2615,11 +2651,6 @@ INFINIBAND_ADDR_TRANS all=y sparc=
#-
INFINIBAND_BNXT_RE all=m
-#-
-#- *** FILE: drivers/infiniband/hw/cxgb3/Kconfig ***
-#-
-INFINIBAND_CXGB3 all=m sparc=
-
#-
#- *** FILE: drivers/infiniband/hw/cxgb4/Kconfig ***
#-
@@ -2878,7 +2909,6 @@ INPUT_ATLAS_BTNS i386=m x86_64=m
INPUT_ATI_REMOTE2 all=m sparc=n
INPUT_KEYSPAN_REMOTE all=m sparc=n
INPUT_KXTJ9 all=m
-INPUT_KXTJ9_POLLED_MODE all=y
INPUT_POWERMATE all=m sparc=n
INPUT_YEALINK all=m sparc=n
INPUT_CM109 all=m
@@ -4403,7 +4433,6 @@ AB3100_CORE all=y
AB3100_OTP all=m
AB8500_CORE all=y
AB8500_DEBUG all=n
-AB8500_GPADC all=y
MFD_STMPE all=y
STMPE_SPI all=y
MFD_SYSCON all=y
@@ -4566,21 +4595,13 @@ INTEL_MEI_HDCP all=m
#-
#- *** FILE: drivers/misc/mic/Kconfig ***
#-
-#- Intel MIC Bus Driver
INTEL_MIC_BUS all=m
-#- SCIF Bus Driver
SCIF_BUS all=m
-#- VOP Bus Driver
VOP_BUS all=m
-#- Intel MIC Host Driver
INTEL_MIC_HOST all=m
-#- Intel MIC Card Driver
INTEL_MIC_CARD all=m
-#- SCIF Driver
SCIF all=m
-#- Intel MIC Coprocessor State Management (COSM) Drivers
MIC_COSM all=m
-#- VOP Driver
VOP all=m
#- file drivers/vhost/Kconfig.vringh goes here
@@ -4922,7 +4943,7 @@ ARCNET_COM20020_CS all=m
#-
#- *** FILE: drivers/net/caif/Kconfig ***
#-
-#- CAIF transport drivers
+CAIF_DRIVERS all=y
CAIF_TTY all=m
CAIF_SPI_SLAVE all=m
CAIF_SPI_SYNC all=y
@@ -5037,6 +5058,7 @@ NET_DSA_MT7530 all=m
NET_DSA_MV88E6060 all=m
#- file drivers/net/dsa/microchip/Kconfig goes here
#- file drivers/net/dsa/mv88e6xxx/Kconfig goes here
+#- file drivers/net/dsa/ocelot/Kconfig goes here
#- file drivers/net/dsa/sja1105/Kconfig goes here
NET_DSA_QCA8K all=m
NET_DSA_REALTEK_SMI all=m
@@ -5069,6 +5091,11 @@ NET_DSA_MV88E6XXX all=m
NET_DSA_MV88E6XXX_GLOBAL2 all=y
NET_DSA_MV88E6XXX_PTP all=y
+#-
+#- *** FILE: drivers/net/dsa/ocelot/Kconfig ***
+#-
+NET_DSA_MSCC_FELIX all=m
+
#-
#- *** FILE: drivers/net/dsa/sja1105/Kconfig ***
#-
@@ -5138,7 +5165,6 @@ DNET all=m
#- file drivers/net/ethernet/fujitsu/Kconfig goes here
#- file drivers/net/ethernet/google/Kconfig goes here
#- file drivers/net/ethernet/hisilicon/Kconfig goes here
-#- file drivers/net/ethernet/hp/Kconfig goes here
#- file drivers/net/ethernet/huawei/Kconfig goes here
#- file drivers/net/ethernet/i825xx/Kconfig goes here
#- file drivers/net/ethernet/ibm/Kconfig goes here
@@ -5443,12 +5469,6 @@ PCMCIA_FMVJ18X all=m
NET_VENDOR_GOOGLE all=y
GVE all=m
-#-
-#- *** FILE: drivers/net/ethernet/hp/Kconfig ***
-#-
-NET_VENDOR_HP all=y
-HP100 all=m
-
#-
#- *** FILE: drivers/net/ethernet/huawei/Kconfig ***
#-
@@ -5924,7 +5944,6 @@ ADIN_PHY all=m
AMD_PHY all=m
AQUANTIA_PHY all=m
AX88796B_PHY all=m
-AT803X_PHY all=m
BCM63XX_PHY all=m
BCM7XXX_PHY all=m
BCM87XX_PHY all=m
@@ -5936,6 +5955,7 @@ DP83822_PHY all=m
DP83TC811_PHY all=m
DP83848_PHY all=m
DP83867_PHY all=m
+DP83869_PHY all=m
FIXED_PHY all=y
ICPLUS_PHY all=m
INTEL_XWAY_PHY all=m
@@ -5949,6 +5969,7 @@ MICROCHIP_T1_PHY all=m
MICROSEMI_PHY all=m
NATIONAL_PHY all=m
NXP_TJA11XX_PHY all=m
+AT803X_PHY all=m
QSEMI_PHY all=m
REALTEK_PHY all=m
RENESAS_PHY all=m
@@ -6628,6 +6649,7 @@ NFC_NXP_NCI_I2C all=m
NFC_PN533 all=m
NFC_PN533_USB all=m
NFC_PN533_I2C all=m
+NFC_PN532_UART all=m
#-
#- *** FILE: drivers/nfc/pn544/Kconfig ***
@@ -6711,6 +6733,7 @@ NVDIMM_DAX all=y
NVME_CORE all=m
BLK_DEV_NVME all=m
NVME_MULTIPATH all=y
+NVME_HWMON all=y
NVME_RDMA all=m
NVME_FC all=m
NVME_TCP all=m
@@ -6820,7 +6843,6 @@ PCIEAER all=y
PCIEAER_INJECT all=m
PCIE_ECRC all=y
PCIEASPM all=y
-PCIEASPM_DEBUG all=n
PCIEASPM_DEFAULT all=y
PCIEASPM_POWERSAVE all=n
PCIEASPM_POWER_SUPERSAVE all=n
@@ -6965,6 +6987,7 @@ PINCTRL_GEMINILAKE all=m
PINCTRL_ICELAKE all=m
PINCTRL_LEWISBURG all=m
PINCTRL_SUNRISEPOINT all=m
+PINCTRL_TIGERLAKE all=m
#-
#- *** FILE: drivers/platform/chrome/Kconfig ***
@@ -6983,6 +7006,7 @@ CROS_KBD_LED_BACKLIGHT all=m
CROS_EC_CHARDEV all=m
CROS_EC_LIGHTBAR all=m
CROS_EC_DEBUGFS all=m
+CROS_EC_SENSORHUB all=m
CROS_EC_SYSFS all=m
CROS_USBPD_LOGGER all=m
#- file drivers/platform/chrome/wilco_ec/Kconfig goes here
@@ -7100,6 +7124,7 @@ INTEL_ATOMISP2_PM all=m
HUAWEI_WMI all=m
PCENGINES_APU2 all=m
#- file drivers/platform/x86/intel_speed_select_if/Kconfig goes here
+SYSTEM76_ACPI all=m
#-
#- *** FILE: drivers/platform/x86/intel_speed_select_if/Kconfig ***
@@ -7141,6 +7166,7 @@ POWER_AVS all=y
#- *** FILE: drivers/power/reset/Kconfig ***
#-
POWER_RESET all=y
+POWER_RESET_MT6323 all=y
POWER_RESET_RESTART all=n
#-
@@ -7236,6 +7262,7 @@ PTP_1588_CLOCK all=m
#- Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
PTP_1588_CLOCK_PCH all=m
PTP_1588_CLOCK_KVM all=m
+PTP_1588_CLOCK_IDTCM all=m
#-
#- *** FILE: drivers/pwm/Kconfig ***
@@ -7933,6 +7960,8 @@ STAGING all=y
#- file drivers/staging/uwb/Kconfig goes here
#- file drivers/staging/exfat/Kconfig goes here
#- file drivers/staging/qlge/Kconfig goes here
+#- file drivers/staging/hp/Kconfig goes here
+#- file drivers/staging/wfx/Kconfig goes here
#-
#- *** FILE: drivers/staging/axis-fifo/Kconfig ***
@@ -8073,7 +8102,6 @@ COMEDI_NI_TIO all=m
#- *** FILE: drivers/staging/exfat/Kconfig ***
#-
EXFAT_FS all=m
-EXFAT_DONT_MOUNT_VFAT all=y
EXFAT_DISCARD all=y
EXFAT_DELAYED_SYNC all=n
EXFAT_KERNEL_DEBUG all=n
@@ -8102,6 +8130,7 @@ FB_TFT_PCD8544 all=m
FB_TFT_RA8875 all=m
FB_TFT_S6D02A1 all=m
FB_TFT_S6D1121 all=m
+FB_TFT_SEPS525 all=m
FB_TFT_SH1106 all=m
FB_TFT_SSD1289 all=m
FB_TFT_SSD1305 all=m
@@ -8173,6 +8202,12 @@ GREYBUS_USB all=m
#-
GS_FPGABOOT all=m
+#-
+#- *** FILE: drivers/staging/hp/Kconfig ***
+#-
+NET_VENDOR_HP all=y
+HP100 all=m
+
#-
#- *** FILE: drivers/staging/iio/accel/Kconfig ***
#-
@@ -8460,6 +8495,11 @@ VT6655 all=m
#-
VT6656 all=m
+#-
+#- *** FILE: drivers/staging/wfx/Kconfig ***
+#-
+WFX all=m
+
#-
#- *** FILE: drivers/staging/wilc1000/Kconfig ***
#-
@@ -9142,6 +9182,7 @@ USB_UAS all=m
TYPEC all=m
#- file drivers/usb/typec/tcpm/Kconfig goes here
#- file drivers/usb/typec/ucsi/Kconfig goes here
+TYPEC_HD3SS3220 all=m
TYPEC_TPS6598X all=m
#- file drivers/usb/typec/mux/Kconfig goes here
#- file drivers/usb/typec/altmodes/Kconfig goes here
@@ -9252,7 +9293,7 @@ BACKLIGHT_PWM all=m
BACKLIGHT_DA903X all=m
BACKLIGHT_DA9052 all=m
BACKLIGHT_APPLE all=m
-BACKLIGHT_PM8941_WLED all=m
+BACKLIGHT_QCOM_WLED all=m
BACKLIGHT_SAHARA all=m
BACKLIGHT_WM831X all=m
BACKLIGHT_ADP8860 all=m
@@ -9516,6 +9557,7 @@ W1_SLAVE_DS2413 all=m
W1_SLAVE_DS2406 all=m
W1_SLAVE_DS2423 all=m
W1_SLAVE_DS2805 all=m
+W1_SLAVE_DS2430 all=m
W1_SLAVE_DS2431 all=m
W1_SLAVE_DS2433 all=m
W1_SLAVE_DS2433_CRC all=y sparc=n
@@ -9721,6 +9763,7 @@ MISC_FILESYSTEMS all=y
#- file fs/sysv/Kconfig goes here
#- file fs/ufs/Kconfig goes here
#- file fs/erofs/Kconfig goes here
+#- file fs/aufs/Kconfig goes here
NETWORK_FILESYSTEMS all=y
#- file fs/nfs/Kconfig goes here
#- file fs/nfsd/Kconfig goes here
@@ -9768,6 +9811,12 @@ AFS_DEBUG all=n
AFS_FSCACHE all=y
AFS_DEBUG_CURSOR all=n
+#-
+#- *** FILE: fs/aufs/Kconfig ***
+#-
+AUFS_FHSM all=y
+AUFS_DIRREN all=y
+
#-
#- *** FILE: fs/autofs/Kconfig ***
#-
@@ -9901,6 +9950,7 @@ EXT4_USE_FOR_EXT2 all=y
EXT4_FS_POSIX_ACL all=y
EXT4_FS_SECURITY all=y
EXT4_DEBUG all=n
+EXT4_KUNIT_TESTS all=y
#-
#- *** FILE: fs/f2fs/Kconfig ***
@@ -10306,8 +10356,6 @@ XFS_DEBUG all=n
DEFCONFIG_LIST all="/lib/modules/$UNAME_RELEASE/.config"
INIT_ENV_ARG_LIMIT all=32
COMPILE_TEST all=n
-HEADER_TEST all=n
-KERNEL_HEADER_TEST all=n
UAPI_HEADER_TEST all=y
LOCALVERSION_AUTO all=y
BUILD_SALT all=""
@@ -10587,6 +10635,7 @@ FTRACE_MCOUNT_RECORD all=y
FTRACE_STARTUP_TEST all=n
MMIOTRACE x86=n
HIST_TRIGGERS all=n
+TRACE_EVENT_INJECT all=n
TRACEPOINT_BENCHMARK all=n
RING_BUFFER_BENCHMARK all=m
RING_BUFFER_STARTUP_TEST all=n
@@ -10648,6 +10697,8 @@ CONSOLE_LOGLEVEL_QUIET all=4
MESSAGE_LOGLEVEL_DEFAULT all=4
BOOT_PRINTK_DELAY all=y
DYNAMIC_DEBUG all=n
+SYMBOLIC_ERRNAME all=y
+DEBUG_BUGVERBOSE all=y
DEBUG_INFO all=y
DEBUG_INFO_REDUCED all=n
DEBUG_INFO_SPLIT all=y
@@ -10658,10 +10709,7 @@ ENABLE_MUST_CHECK all=y
FRAME_WARN all=2048
STRIP_ASM_SYMS all=y
READABLE_ASM all=n
-#* required by oprofile
-DEBUG_FS all=y
HEADERS_INSTALL all=y
-HEADERS_CHECK all=y
DEBUG_SECTION_MISMATCH all=n
SECTION_MISMATCH_WARN_ONLY all=y
FRAME_POINTER i386=y x86_64=y
@@ -10670,6 +10718,10 @@ DEBUG_FORCE_WEAK_PER_CPU all=n
MAGIC_SYSRQ all=y
MAGIC_SYSRQ_DEFAULT_ENABLE all=0x1
MAGIC_SYSRQ_SERIAL all=y
+#* required by oprofile
+DEBUG_FS all=y
+#- file lib/Kconfig.kgdb goes here
+#- file lib/Kconfig.ubsan goes here
DEBUG_KERNEL all=y
DEBUG_MISC all=y
#- file mm/Kconfig.debug goes here
@@ -10678,14 +10730,15 @@ DEBUG_SLAB all=n
SLUB_DEBUG_ON all=n
SLUB_STATS all=n
DEBUG_KMEMLEAK all=n
+SCHED_STACK_END_CHECK all=y
DEBUG_VM all=n
DEBUG_VIRTUAL all=n
MEMORY_NOTIFIER_ERROR_INJECT all=m
DEBUG_HIGHMEM i386=n sparc=n
#- file lib/Kconfig.kasan goes here
-ARCH_HAS_KCOV all=y
-KCOV all=n
DEBUG_SHIRQ all=n
+PANIC_ON_OOPS all=n
+PANIC_TIMEOUT all=180
LOCKUP_DETECTOR all=y
SOFTLOCKUP_DETECTOR all=y
BOOTPARAM_SOFTLOCKUP_PANIC all=n
@@ -10696,11 +10749,8 @@ DETECT_HUNG_TASK all=y
DEFAULT_HUNG_TASK_TIMEOUT all=120
BOOTPARAM_HUNG_TASK_PANIC all=n
WQ_WATCHDOG all=y
-PANIC_ON_OOPS all=n
-PANIC_TIMEOUT all=180
SCHED_DEBUG all=n
SCHEDSTATS all=n
-SCHED_STACK_END_CHECK all=y
DEBUG_TIMEKEEPING all=n
PROVE_LOCKING all=n
LOCK_STAT all=n
@@ -10717,23 +10767,28 @@ WW_MUTEX_SELFTEST all=m
WARN_ALL_UNSEEDED_RANDOM all=y
DEBUG_KOBJECT all=n
DEBUG_KOBJECT_RELEASE all=n
-DEBUG_BUGVERBOSE all=y
DEBUG_LIST all=n
DEBUG_PLIST all=n
DEBUG_SG all=n
DEBUG_NOTIFIERS all=n
+BUG_ON_DATA_CORRUPTION all=n
DEBUG_CREDENTIALS all=n
#- file kernel/rcu/Kconfig.debug goes here
DEBUG_WQ_FORCE_RR_CPU all=n
DEBUG_BLOCK_EXT_DEVT all=n
CPU_HOTPLUG_STATE_CONTROL all=n
+LATENCYTOP all=n
+#- file kernel/trace/Kconfig goes here
+PROVIDE_OHCI1394_DMA_INIT all=n
+#- file samples/Kconfig goes here
+#- file arch/$(SRCARCH)/Kconfig.debug goes here
+#- file lib/kunit/Kconfig goes here
NOTIFIER_ERROR_INJECTION all=m
PM_NOTIFIER_ERROR_INJECT all=m
NETDEV_NOTIFIER_ERROR_INJECT all=m
FAULT_INJECTION all=n
-LATENCYTOP all=n
-#- file kernel/trace/Kconfig goes here
-PROVIDE_OHCI1394_DMA_INIT all=n
+ARCH_HAS_KCOV all=y
+KCOV all=n
RUNTIME_TESTING_MENU all=y
LKDTM all=m
TEST_LIST_SORT all=n
@@ -10768,6 +10823,8 @@ TEST_BLACKHOLE_DEV all=m
FIND_BIT_BENCHMARK all=m
TEST_FIRMWARE all=m
TEST_SYSCTL all=m
+SYSCTL_KUNIT_TEST all=y
+LIST_KUNIT_TEST all=y
TEST_UDELAY all=m
TEST_STATIC_KEYS all=m
TEST_KMOD all=m
@@ -10775,11 +10832,7 @@ TEST_MEMCAT_P all=m
TEST_OBJAGG all=m
TEST_STACKINIT all=m
TEST_MEMINIT all=m
-BUG_ON_DATA_CORRUPTION all=n
-#- file samples/Kconfig goes here
-#- file lib/Kconfig.kgdb goes here
-#- file lib/Kconfig.ubsan goes here
-#- file arch/$(SRCARCH)/Kconfig.debug goes here
+HYPERV_TESTING all=y
#-
#- *** FILE: lib/Kconfig.kasan ***
@@ -10804,6 +10857,16 @@ KDB_CONTINUE_CATASTROPHIC all=0
#-
UBSAN all=n
+#-
+#- *** FILE: lib/crypto/Kconfig ***
+#-
+#- Crypto library routines
+CRYPTO_LIB_BLAKE2S all=m
+CRYPTO_LIB_CHACHA all=m
+CRYPTO_LIB_CURVE25519 all=m
+CRYPTO_LIB_POLY1305 all=m
+CRYPTO_LIB_CHACHA20POLY1305 all=m
+
#-
#- *** FILE: lib/fonts/Kconfig ***
#-
@@ -10819,6 +10882,13 @@ FONT_10x18 all=n
FONT_SUN8x16 ppc=n ppc64=n sparc=y sparc64=y
FONT_SUN12x22 ppc=n ppc64=n sparc=y sparc64=y
+#-
+#- *** FILE: lib/kunit/Kconfig ***
+#-
+KUNIT all=y
+KUNIT_TEST all=y
+KUNIT_EXAMPLE_TEST all=n
+
#-
#- *** FILE: lib/math/Kconfig ***
#-
@@ -11205,6 +11275,7 @@ DNS_RESOLVER all=m
NET_DSA all=m
NET_DSA_TAG_8021Q all=m
NET_DSA_TAG_KSZ all=m
+NET_DSA_TAG_OCELOT all=m
NET_DSA_TAG_SJA1105 all=m
#-
@@ -11875,6 +11946,7 @@ NET_SWITCHDEV all=y
TIPC all=m
TIPC_MEDIA_IB all=y
TIPC_MEDIA_UDP all=y
+TIPC_CRYPTO all=y
TIPC_DIAG all=m
#-
@@ -11882,6 +11954,7 @@ TIPC_DIAG all=m
#-
TLS all=m
TLS_DEVICE all=y
+TLS_TOE all=n
#-
#- *** FILE: net/unix/Kconfig ***
@@ -12356,7 +12429,6 @@ SND_YMFPCI all=m
#- *** FILE: sound/pci/hda/Kconfig ***
#-
SND_HDA_INTEL all=m sparc=n
-SND_HDA_INTEL_DETECT_DMIC all=y
SND_HDA_HWDEP all=y
SND_HDA_RECONFIG all=y
SND_HDA_INPUT_BEEP all=y
@@ -12470,6 +12542,8 @@ SND_SOC_ADAU1701 all=m
SND_SOC_ADAU1761_I2C all=m
SND_SOC_ADAU1761_SPI all=m
SND_SOC_ADAU7002 all=m
+SND_SOC_ADAU7118_HW all=m
+SND_SOC_ADAU7118_I2C all=m
SND_SOC_AK4104 all=m
SND_SOC_AK4118 all=m
SND_SOC_AK4458 all=m
@@ -12553,6 +12627,8 @@ SND_SOC_STA32X all=m
SND_SOC_STA350 all=m
SND_SOC_STI_SAS all=m
SND_SOC_TAS2552 all=m
+SND_SOC_TAS2562 all=m
+SND_SOC_TAS2770 all=m
SND_SOC_TAS5086 all=m
SND_SOC_TAS571X all=m
SND_SOC_TAS5720 all=m
@@ -12620,6 +12696,7 @@ SND_DESIGNWARE_PCM all=y
#- Common SoC Audio options for Freescale CPUs:
SND_SOC_FSL_ASRC all=m
SND_SOC_FSL_SAI all=m
+SND_SOC_FSL_MQS all=m
SND_SOC_FSL_AUDMIX all=m
SND_SOC_FSL_SSI all=m
SND_SOC_FSL_SPDIF all=m
@@ -12700,10 +12777,12 @@ SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH all=m
SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH all=m
SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH all=m
SND_SOC_INTEL_KBL_RT5660_MACH all=m
+SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH all=m
SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH all=m
SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH all=m
SND_SOC_INTEL_SOF_RT5682_MACH all=m
SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH all=m
+SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH all=m
#-
#- *** FILE: sound/soc/mediatek/Kconfig ***
@@ -12744,9 +12823,11 @@ SND_SOC_SOF_COMETLAKE_LP_SUPPORT all=y
SND_SOC_SOF_COMETLAKE_H_SUPPORT all=y
SND_SOC_SOF_TIGERLAKE_SUPPORT all=y
SND_SOC_SOF_ELKHARTLAKE_SUPPORT all=y
+SND_SOC_SOF_JASPERLAKE_SUPPORT all=y
SND_SOC_SOF_HDA_LINK all=y
SND_SOC_SOF_HDA_AUDIO_CODEC all=y
SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 all=y
+SND_SOC_SOF_HDA_COMMON_HDMI_CODEC all=y
#-
#- *** FILE: sound/soc/sunxi/Kconfig ***
@@ -12838,11 +12919,11 @@ AD7152 all=m
AGP_SGI_TIOCA ia64=m
ANON_INODES all=y
ASIX_PHY all=m
-AUFS_DIRREN all=y
-AUFS_FHSM all=y
BACKLIGHT_LCD_SUPPORT all=y
+BACKLIGHT_PM8941_WLED all=m
BLK_DEV_SGIIOC4 ia64=m
BLK_WBT_SQ all=y
+BT_WILINK all=m
CAPI_EICON all=y
CFQ_GROUP_IOSCHED all=y
CHARGER_LTC3651 all=m
@@ -12857,6 +12938,7 @@ CRYPTO_AEGIS256 all=m
CRYPTO_AEGIS256_AESNI_SSE2 all=m
CRYPTO_AES_586 i386=m
CRYPTO_AES_X86_64 x86_64=m
+CRYPTO_BLKCIPHER all=y
CRYPTO_MORUS1280 all=m
CRYPTO_MORUS1280_AVX2 all=m
CRYPTO_MORUS1280_SSE2 all=m
@@ -12879,6 +12961,7 @@ EROFS_FS_USE_VM_MAP_RAM all=y
EROFS_FS_ZIP_CACHE_BIPOLAR all=y
EROFS_FS_ZIP_CACHE_UNIPOLAR all=n
EROFS_FS_ZIP_NO_CACHE all=n
+EXFAT_DONT_MOUNT_VFAT all=y
EXOFS_DEBUG all=n
EXOFS_FS all=m
EXT4_ENCRYPTION all=y
@@ -12891,6 +12974,8 @@ FMC_CHARDEV all=m
FMC_FAKEDEV all=m
FMC_TRIVIAL all=m
FMC_WRITE_EEPROM all=m
+HEADERS_CHECK all=y
+HEADER_TEST all=n
HOTPLUG_PCI_SGI ia64=m
I2C_BCM2048 all=m
INET6_XFRM_MODE_BEET all=m
@@ -12900,8 +12985,10 @@ INET6_XFRM_MODE_TUNNEL all=m
INET_XFRM_MODE_BEET all=m
INET_XFRM_MODE_TRANSPORT all=m
INET_XFRM_MODE_TUNNEL all=m
+INFINIBAND_CXGB3 all=m sparc=
INFINIBAND_NES all=m sparc=
INFINIBAND_NES_DEBUG all=n
+INPUT_KXTJ9_POLLED_MODE all=y
INTEL_RDT all=y
IOSCHED_CFQ all=y
IOSCHED_DEADLINE all=y
@@ -12926,6 +13013,7 @@ ISDN_PPP_VJ all=y
ISDN_TTY_FAX all=y
ISDN_X25 all=y
IWLWIFI_PCIE_RTPM all=y
+KERNEL_HEADER_TEST all=n
KEXEC_VERIFY_SIG all=n
LBDAF i386=y ppc=y sparc=y sparc64=
LCD_OTM3225A all=m
@@ -12959,9 +13047,11 @@ NFT_REDIR_IPV6 all=m
NF_NAT_IPV4 all=m
NF_NAT_IPV6 all=m
NR_QUICK sparc64=1
+PCIEASPM_DEBUG all=n
PSW_PHY_SEL all=n
QTNFMAC_PEARL_PCIE all=m
R8822BE all=m
+REFCOUNT_FULL all=n
SCSI_MQ_DEFAULT all=y
SCSI_OSD_DEBUG all=n
SCSI_OSD_DPRINT_SENSE all=1
@@ -12979,6 +13069,7 @@ SGI_IOC4 all=m ppc=n ppc64=n
SGI_MBCS ia64=m
SGI_SNSC ia64=y
SGI_TIOCX ia64=y
+SND_HDA_INTEL_DETECT_DMIC all=y
SOC_CAMERA_MT9M001 all=m
SOC_CAMERA_MT9T112 all=m
SOC_CAMERA_OV772X all=m
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 081469f2..8d985892 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -1,477 +1,3 @@
-Nothing here for now, move along...
-commit c695793b52216ad6a11ce952fc8d29f3a9d0c7cd
-Author: Balsundar P <balsundar.p at microsemi.com>
-Date: Tue Oct 15 11:52:04 2019 +0530
-
- scsi: aacraid: bump version
-
- Bump version to 50877.
-
- Link: https://lore.kernel.org/r/1571120524-6037-8-git-send-email-balsundar.p@microsemi.com
- Signed-off-by: Balsundar P <balsundar.p at microsemi.com>
- Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
-
-diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index 17a4e8b8bd00..e3e4ecbea726 100644
---- a/drivers/scsi/aacraid/aacraid.h
-+++ b/drivers/scsi/aacraid/aacraid.h
-@@ -85,7 +85,7 @@ enum {
- #define PMC_GLOBAL_INT_BIT0 0x00000001
-
- #ifndef AAC_DRIVER_BUILD
--# define AAC_DRIVER_BUILD 50877
-+# define AAC_DRIVER_BUILD 50983
- # define AAC_DRIVER_BRANCH "-custom"
- #endif
- #define MAXIMUM_NUM_CONTAINERS 32
-
-commit 26c54d0ec25c186329d845ad1beb9d3dde586af9
-Author: Balsundar P <balsundar.p at microsemi.com>
-Date: Tue Oct 15 11:52:03 2019 +0530
-
- scsi: aacraid: send AIF request post IOP RESET
-
- After IOP reset completion, AIF request command is not issued to the
- controller. Driver schedules a worker thread to issue a AIF request command
- after IOP reset completion.
-
- [mkp: fix zeroday warning]
-
- Link: https://lore.kernel.org/r/1571120524-6037-7-git-send-email-balsundar.p@microsemi.com
- Acked-by: Balsundar P < Balsundar.P at microchip.com>
- Signed-off-by: Balsundar P <balsundar.p at microsemi.com>
- Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
-
-diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index f76a33cb0259..17a4e8b8bd00 100644
---- a/drivers/scsi/aacraid/aacraid.h
-+++ b/drivers/scsi/aacraid/aacraid.h
-@@ -1330,7 +1330,7 @@ struct fib {
- #define AAC_DEVTYPE_ARC_RAW 2
- #define AAC_DEVTYPE_NATIVE_RAW 3
-
--#define AAC_SAFW_RESCAN_DELAY (10 * HZ)
-+#define AAC_RESCAN_DELAY (10 * HZ)
-
- struct aac_hba_map_info {
- __le32 rmw_nexus; /* nexus for native HBA devices */
-@@ -1603,6 +1603,7 @@ struct aac_dev
- struct fsa_dev_info *fsa_dev;
- struct task_struct *thread;
- struct delayed_work safw_rescan_work;
-+ struct delayed_work src_reinit_aif_worker;
- int cardtype;
- /*
- *This lock will protect the two 32-bit
-@@ -2647,7 +2648,12 @@ int aac_scan_host(struct aac_dev *dev);
-
- static inline void aac_schedule_safw_scan_worker(struct aac_dev *dev)
- {
-- schedule_delayed_work(&dev->safw_rescan_work, AAC_SAFW_RESCAN_DELAY);
-+ schedule_delayed_work(&dev->safw_rescan_work, AAC_RESCAN_DELAY);
-+}
-+
-+static inline void aac_schedule_src_reinit_aif_worker(struct aac_dev *dev)
-+{
-+ schedule_delayed_work(&dev->src_reinit_aif_worker, AAC_RESCAN_DELAY);
- }
-
- static inline void aac_safw_rescan_worker(struct work_struct *work)
-@@ -2661,10 +2667,10 @@ static inline void aac_safw_rescan_worker(struct work_struct *work)
- aac_scan_host(dev);
- }
-
--static inline void aac_cancel_safw_rescan_worker(struct aac_dev *dev)
-+static inline void aac_cancel_rescan_worker(struct aac_dev *dev)
- {
-- if (dev->sa_firmware)
-- cancel_delayed_work_sync(&dev->safw_rescan_work);
-+ cancel_delayed_work_sync(&dev->safw_rescan_work);
-+ cancel_delayed_work_sync(&dev->src_reinit_aif_worker);
- }
-
- /* SCp.phase values */
-@@ -2674,6 +2680,7 @@ static inline void aac_cancel_safw_rescan_worker(struct aac_dev *dev)
- #define AAC_OWNER_FIRMWARE 0x106
-
- void aac_safw_rescan_worker(struct work_struct *work);
-+void aac_src_reinit_aif_worker(struct work_struct *work);
- int aac_acquire_irq(struct aac_dev *dev);
- void aac_free_irq(struct aac_dev *dev);
- int aac_setup_safw_adapter(struct aac_dev *dev);
-@@ -2731,6 +2738,7 @@ int aac_probe_container(struct aac_dev *dev, int cid);
- int _aac_rx_init(struct aac_dev *dev);
- int aac_rx_select_comm(struct aac_dev *dev, int comm);
- int aac_rx_deliver_producer(struct fib * fib);
-+void aac_reinit_aif(struct aac_dev *aac, unsigned int index);
-
- static inline int aac_is_src(struct aac_dev *dev)
- {
-diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
-index 3f268f669cc3..5a8a999606ea 100644
---- a/drivers/scsi/aacraid/commsup.c
-+++ b/drivers/scsi/aacraid/commsup.c
-@@ -1464,6 +1464,14 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
- }
- }
-
-+static void aac_schedule_bus_scan(struct aac_dev *aac)
-+{
-+ if (aac->sa_firmware)
-+ aac_schedule_safw_scan_worker(aac);
-+ else
-+ aac_schedule_src_reinit_aif_worker(aac);
-+}
-+
- static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)
- {
- int index, quirks;
-@@ -1639,7 +1647,7 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)
- */
- if (!retval && !is_kdump_kernel()) {
- dev_info(&aac->pdev->dev, "Scheduling bus rescan\n");
-- aac_schedule_safw_scan_worker(aac);
-+ aac_schedule_bus_scan(aac);
- }
-
- if (jafo) {
-@@ -1960,6 +1968,16 @@ int aac_scan_host(struct aac_dev *dev)
- return rcode;
- }
-
-+void aac_src_reinit_aif_worker(struct work_struct *work)
-+{
-+ struct aac_dev *dev = container_of(to_delayed_work(work),
-+ struct aac_dev, src_reinit_aif_worker);
-+
-+ wait_event(dev->scsi_host_ptr->host_wait,
-+ !scsi_host_in_recovery(dev->scsi_host_ptr));
-+ aac_reinit_aif(dev, dev->cardtype);
-+}
-+
- /**
- * aac_handle_sa_aif Handle a message from the firmware
- * @dev: Which adapter this fib is from
-diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 55a55c56fea9..ee6bc2f9b80a 100644
---- a/drivers/scsi/aacraid/linit.c
-+++ b/drivers/scsi/aacraid/linit.c
-@@ -1593,6 +1593,19 @@ static void aac_init_char(void)
- }
- }
-
-+void aac_reinit_aif(struct aac_dev *aac, unsigned int index)
-+{
-+ /*
-+ * Firmware may send a AIF messages very early and the Driver may have
-+ * ignored as it is not fully ready to process the messages. Send
-+ * AIF to firmware so that if there are any unprocessed events they
-+ * can be processed now.
-+ */
-+ if (aac_drivers[index].quirks & AAC_QUIRK_SRC)
-+ aac_intr_normal(aac, 0, 2, 0, NULL);
-+
-+}
-+
- static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
- {
- unsigned index = id->driver_data;
-@@ -1690,6 +1703,8 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
- mutex_init(&aac->scan_mutex);
-
- INIT_DELAYED_WORK(&aac->safw_rescan_work, aac_safw_rescan_worker);
-+ INIT_DELAYED_WORK(&aac->src_reinit_aif_worker,
-+ aac_src_reinit_aif_worker);
- /*
- * Map in the registers from the adapter.
- */
-@@ -1880,7 +1895,7 @@ static int aac_suspend(struct pci_dev *pdev, pm_message_t state)
- struct aac_dev *aac = (struct aac_dev *)shost->hostdata;
-
- scsi_block_requests(shost);
-- aac_cancel_safw_rescan_worker(aac);
-+ aac_cancel_rescan_worker(aac);
- aac_send_shutdown(aac);
-
- aac_release_resources(aac);
-@@ -1939,7 +1954,7 @@ static void aac_remove_one(struct pci_dev *pdev)
- struct Scsi_Host *shost = pci_get_drvdata(pdev);
- struct aac_dev *aac = (struct aac_dev *)shost->hostdata;
-
-- aac_cancel_safw_rescan_worker(aac);
-+ aac_cancel_rescan_worker(aac);
- scsi_remove_host(shost);
-
- __aac_shutdown(aac);
-@@ -1997,7 +2012,7 @@ static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev,
- aac->handle_pci_error = 1;
-
- scsi_block_requests(aac->scsi_host_ptr);
-- aac_cancel_safw_rescan_worker(aac);
-+ aac_cancel_rescan_worker(aac);
- aac_flush_ios(aac);
- aac_release_resources(aac);
-
-
-commit 572ee53a9badf62f3973d66f6475f9ce69720a25
-Author: Balsundar P <balsundar.p at microsemi.com>
-Date: Tue Oct 15 11:52:02 2019 +0530
-
- scsi: aacraid: check adapter health
-
- Currently driver waits for the command IOCTL from the firmware and if the
- firmware enters nonresponsive state, the driver doesn't respond till the
- firmware is responsive again.
-
- Check that firmware is alive, otherwise return -EBUSY.
-
- [mkp: clarified commit desc]
-
- Link: https://lore.kernel.org/r/1571120524-6037-6-git-send-email-balsundar.p@microsemi.com
- Signed-off-by: Balsundar P <balsundar.p at microsemi.com>
- Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
-
-diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 40f78509ca94..55a55c56fea9 100644
---- a/drivers/scsi/aacraid/linit.c
-+++ b/drivers/scsi/aacraid/linit.c
-@@ -612,9 +612,13 @@ static struct device_attribute *aac_dev_attrs[] = {
- static int aac_ioctl(struct scsi_device *sdev, unsigned int cmd,
- void __user *arg)
- {
-+ int retval;
- struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata;
- if (!capable(CAP_SYS_RAWIO))
- return -EPERM;
-+ retval = aac_adapter_check_health(dev);
-+ if (retval)
-+ return -EBUSY;
- return aac_do_ioctl(dev, cmd, arg);
- }
-
-
-commit e2fd90dd2ed87bdcfdfb640f06da48fd23efa080
-Author: Balsundar P <balsundar.p at microsemi.com>
-Date: Tue Oct 15 11:52:01 2019 +0530
-
- scsi: aacraid: setting different timeout for src and thor
-
- Set 180 second timeout for thor and 60 seconds for src controllers.
-
- Link: https://lore.kernel.org/r/1571120524-6037-5-git-send-email-balsundar.p@microsemi.com
- Signed-off-by: Balsundar P <balsundar.p at microsemi.com>
- Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
-
-diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
-index 2388143d59f5..e36608ce937a 100644
---- a/drivers/scsi/aacraid/aachba.c
-+++ b/drivers/scsi/aacraid/aachba.c
-@@ -1477,6 +1477,7 @@ static struct aac_srb * aac_scsi_common(struct fib * fib, struct scsi_cmnd * cmd
- struct aac_srb * srbcmd;
- u32 flag;
- u32 timeout;
-+ struct aac_dev *dev = fib->dev;
-
- aac_fib_init(fib);
- switch(cmd->sc_data_direction){
-@@ -1503,7 +1504,7 @@ static struct aac_srb * aac_scsi_common(struct fib * fib, struct scsi_cmnd * cmd
- srbcmd->flags = cpu_to_le32(flag);
- timeout = cmd->request->timeout/HZ;
- if (timeout == 0)
-- timeout = 1;
-+ timeout = (dev->sa_firmware ? AAC_SA_TIMEOUT : AAC_ARC_TIMEOUT);
- srbcmd->timeout = cpu_to_le32(timeout); // timeout in seconds
- srbcmd->retry_limit = 0; /* Obsolete parameter */
- srbcmd->cdb_size = cpu_to_le32(cmd->cmd_len);
-diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index 3fdd4583cbb5..f76a33cb0259 100644
---- a/drivers/scsi/aacraid/aacraid.h
-+++ b/drivers/scsi/aacraid/aacraid.h
-@@ -108,6 +108,8 @@ enum {
- #define AAC_BUS_TARGET_LOOP (AAC_MAX_BUSES * AAC_MAX_TARGETS)
- #define AAC_MAX_NATIVE_SIZE 2048
- #define FW_ERROR_BUFFER_SIZE 512
-+#define AAC_SA_TIMEOUT 180
-+#define AAC_ARC_TIMEOUT 60
-
- #define get_bus_number(x) (x/AAC_MAX_TARGETS)
- #define get_target_number(x) (x%AAC_MAX_TARGETS)
-diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index 4a858789e6c5..40f78509ca94 100644
---- a/drivers/scsi/aacraid/linit.c
-+++ b/drivers/scsi/aacraid/linit.c
-@@ -391,6 +391,7 @@ static int aac_slave_configure(struct scsi_device *sdev)
- int chn, tid;
- unsigned int depth = 0;
- unsigned int set_timeout = 0;
-+ int timeout = 0;
- bool set_qd_dev_type = false;
- u8 devtype = 0;
-
-@@ -483,10 +484,13 @@ static int aac_slave_configure(struct scsi_device *sdev)
-
- /*
- * Firmware has an individual device recovery time typically
-- * of 35 seconds, give us a margin.
-+ * of 35 seconds, give us a margin. Thor devices can take longer in
-+ * error recovery, hence different value.
- */
-- if (set_timeout && sdev->request_queue->rq_timeout < (45 * HZ))
-- blk_queue_rq_timeout(sdev->request_queue, 45*HZ);
-+ if (set_timeout) {
-+ timeout = aac->sa_firmware ? AAC_SA_TIMEOUT : AAC_ARC_TIMEOUT;
-+ blk_queue_rq_timeout(sdev->request_queue, timeout * HZ);
-+ }
-
- if (depth > 256)
- depth = 256;
-
-commit c02a3342bad32baa9be201da39d3809b74f92239
-Author: Balsundar P <balsundar.p at microsemi.com>
-Date: Tue Oct 15 11:52:00 2019 +0530
-
- scsi: aacraid: fixed firmware assert issue
-
- Before issuing IOP reset, INTX mode is selected. This is triggering MSGU
- lockup and ended in basecode assert. Use DROP_IO command when IOP reset is
- sent in preparation for interrupt mode switch.
-
- Link: https://lore.kernel.org/r/1571120524-6037-4-git-send-email-balsundar.p@microsemi.com
- Signed-off-by: Balsundar P <balsundar.p at microsemi.com>
- Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
-
-diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
-index 3fa03230f6ba..3fdd4583cbb5 100644
---- a/drivers/scsi/aacraid/aacraid.h
-+++ b/drivers/scsi/aacraid/aacraid.h
-@@ -1673,6 +1673,7 @@ struct aac_dev
- u8 adapter_shutdown;
- u32 handle_pci_error;
- bool init_reset;
-+ u8 soft_reset_support;
- };
-
- #define aac_adapter_interrupt(dev) \
-diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
-index d4fcfa1e54e0..f75878d773cf 100644
---- a/drivers/scsi/aacraid/comminit.c
-+++ b/drivers/scsi/aacraid/comminit.c
-@@ -571,6 +571,11 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
- else
- dev->sa_firmware = 0;
-
-+ if (status[4] & le32_to_cpu(AAC_EXTOPT_SOFT_RESET))
-+ dev->soft_reset_support = 1;
-+ else
-+ dev->soft_reset_support = 0;
-+
- if ((dev->comm_interface == AAC_COMM_MESSAGE) &&
- (status[2] > dev->base_size)) {
- aac_adapter_ioremap(dev, 0);
-diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
-index 3b66e06726c8..787ec9baebb0 100644
---- a/drivers/scsi/aacraid/src.c
-+++ b/drivers/scsi/aacraid/src.c
-@@ -733,10 +733,20 @@ static bool aac_is_ctrl_up_and_running(struct aac_dev *dev)
- return ctrl_up;
- }
-
-+static void aac_src_drop_io(struct aac_dev *dev)
-+{
-+ if (!dev->soft_reset_support)
-+ return;
-+
-+ aac_adapter_sync_cmd(dev, DROP_IO,
-+ 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);
-+}
-+
- static void aac_notify_fw_of_iop_reset(struct aac_dev *dev)
- {
- aac_adapter_sync_cmd(dev, IOP_RESET_ALWAYS, 0, 0, 0, 0, 0, 0, NULL,
- NULL, NULL, NULL, NULL);
-+ aac_src_drop_io(dev);
- }
-
- static void aac_send_iop_reset(struct aac_dev *dev)
-
-commit f2244c1b35e5302070af4c729db0b0e9eb8350c9
-Author: Balsundar P <balsundar.p at microsemi.com>
-Date: Tue Oct 15 11:51:59 2019 +0530
-
- scsi: aacraid: fixed IO reporting error
-
- The problem is the driver detects FastResponse bit set and saves it to
- Fib's flags to not check IO response status, but it never clears it for
- next IO. Hence the next IO will pick up FastResponse bit to not check
- the IO response status and fail to report any type IO error to kernel
-
- Link: https://lore.kernel.org/r/1571120524-6037-3-git-send-email-balsundar.p@microsemi.com
- Signed-off-by: Balsundar P <balsundar.p at microsemi.com>
- Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
-
-diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
-index 2142a649e865..3f268f669cc3 100644
---- a/drivers/scsi/aacraid/commsup.c
-+++ b/drivers/scsi/aacraid/commsup.c
-@@ -232,6 +232,7 @@ struct fib *aac_fib_alloc_tag(struct aac_dev *dev, struct scsi_cmnd *scmd)
- fibptr->type = FSAFS_NTC_FIB_CONTEXT;
- fibptr->callback_data = NULL;
- fibptr->callback = NULL;
-+ fibptr->flags = 0;
-
- return fibptr;
- }
-
-commit c86fbe484c10b2cd1e770770db2d6b2c88801c1d
-Author: Balsundar P <balsundar.p at microsemi.com>
-Date: Tue Oct 15 11:51:58 2019 +0530
-
- scsi: aacraid: fix illegal IO beyond last LBA
-
- The driver fails to handle data when read or written beyond device reported
- LBA, which triggers kernel panic
-
- Link: https://lore.kernel.org/r/1571120524-6037-2-git-send-email-balsundar.p@microsemi.com
- Signed-off-by: Balsundar P <balsundar.p at microsemi.com>
- Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
-
-diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
-index 0ed3f806ace5..2388143d59f5 100644
---- a/drivers/scsi/aacraid/aachba.c
-+++ b/drivers/scsi/aacraid/aachba.c
-@@ -2467,13 +2467,13 @@ static int aac_read(struct scsi_cmnd * scsicmd)
- scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 |
- SAM_STAT_CHECK_CONDITION;
- set_sense(&dev->fsa_dev[cid].sense_data,
-- HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE,
-+ ILLEGAL_REQUEST, SENCODE_LBA_OUT_OF_RANGE,
- ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0);
- memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
- min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
- SCSI_SENSE_BUFFERSIZE));
- scsicmd->scsi_done(scsicmd);
-- return 1;
-+ return 0;
- }
-
- dprintk((KERN_DEBUG "aac_read[cpu %d]: lba = %llu, t = %ld.\n",
-@@ -2559,13 +2559,13 @@ static int aac_write(struct scsi_cmnd * scsicmd)
- scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 |
- SAM_STAT_CHECK_CONDITION;
- set_sense(&dev->fsa_dev[cid].sense_data,
-- HARDWARE_ERROR, SENCODE_INTERNAL_TARGET_FAILURE,
-+ ILLEGAL_REQUEST, SENCODE_LBA_OUT_OF_RANGE,
- ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0);
- memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
- min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
- SCSI_SENSE_BUFFERSIZE));
- scsicmd->scsi_done(scsicmd);
-- return 1;
-+ return 0;
- }
-
- dprintk((KERN_DEBUG "aac_write[cpu %d]: lba = %llu, t = %ld.\n",
-
; https://lkml.org/lkml/2019/7/10/244
diff -ur linux-5.3/drivers/scsi/aacraid.org/aacraid.h linux-5.3/drivers/scsi/aacraid/aacraid.h
--- linux-5.3/drivers/scsi/aacraid.org/aacraid.h 2019-11-01 22:42:37.011469816 +0100
diff --git a/kernel-x86.config b/kernel-x86.config
index b6cd8940..69341566 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -33,8 +33,6 @@ PARAVIRT_TIME_ACCOUNTING x86=y
HPET_TIMER x86=y
DMI x86=y
GART_IOMMU x86_64=y
-CALGARY_IOMMU x86_64=y
-CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y
MAXSMP i386=n x86_64=n
NR_CPUS i386=32 x86_64=512
SCHED_SMT x86=y
@@ -51,6 +49,7 @@ X86_MCE_INJECT x86=m
X86_LEGACY_VM86 i386=n
VM86 i386=y
X86_VSYSCALL_EMULATION x86=y
+X86_IOPL_IOPERM x86=y
TOSHIBA i386=m
I8K x86=m
X86_REBOOTFIXUPS i386=y
@@ -224,6 +223,8 @@ AMD_IOMMU x86_64=y
ARCH_HAS_GCOV_PROFILE_ALL x86=y
ARCH_HAS_PKEYS all=y
ARCH_USES_HIGH_VMA_FLAGS all=y
+CALGARY_IOMMU x86_64=y
+CALGARY_IOMMU_ENABLED_BY_DEFAULT x86_64=y
COMEDI_AMPLC_DIO200_ISA all=m
COMEDI_AMPLC_PC236_ISA all=m
COMEDI_AMPLC_PC263_ISA all=m
diff --git a/xfs-reclaim-hack.patch b/xfs-reclaim-hack.patch
index a76a7911..c0db7b22 100644
--- a/xfs-reclaim-hack.patch
+++ b/xfs-reclaim-hack.patch
@@ -10,18 +10,6 @@ considerably, especially in high page cache and slow disk environment.
This sysctl allows to exclude XFS from kswapd and direct reclaim.
See: https://marc.info/?t=154345187200003
----
- Documentation/filesystems/xfs.txt | 6 ++++++
- fs/xfs/xfs_globals.c | 1 +
- fs/xfs/xfs_icache.c | 6 +++++-
- fs/xfs/xfs_icache.h | 6 ++++++
- fs/xfs/xfs_linux.h | 1 +
- fs/xfs/xfs_super.c | 3 +++
- fs/xfs/xfs_sysctl.c | 9 +++++++++
- fs/xfs/xfs_sysctl.h | 2 ++
- kernel/sysctl_binary.c | 1 +
- 9 files changed, 34 insertions(+), 1 deletion(-)
-
diff --git a/Documentation/admin-guide/xfs.rst b/Documentation/admin-guide/xfs.rst
index 3b9b5c149f322..b33a4822f879c 100644
--- a/Documentation/admin-guide/xfs.rst
@@ -150,15 +138,4 @@ index 82afee005140a..eaf3addd486e7 100644
};
extern xfs_param_t xfs_params;
-diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
-index e8c0dab4fd653..ec2f2c52e3ab5 100644
---- a/kernel/sysctl_binary.c
-+++ b/kernel/sysctl_binary.c
-@@ -778,6 +778,7 @@ static const struct bin_table bin_fs_xfs_table[] = {
- { CTL_INT, XFS_INHERIT_NODFRG, "inherit_nodefrag" },
- { CTL_INT, XFS_FILESTREAM_TIMER, "filestream_centisecs" },
- { CTL_INT, XFS_STATS_CLEAR, "stats_clear" },
-+ { CTL_INT, XFS_MEMORY_RECLAIM, "memory_reclaim" },
- {}
- };
-
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/d58c55f2695154825b83f75e1487e00ceeccdc9f
More information about the pld-cvs-commit
mailing list