[packages/kernel] - up to 5.3.0
arekm
arekm at pld-linux.org
Mon Sep 16 19:44:48 CEST 2019
commit eca34b5cb0c32e09e185c20cc5cecb73d9475975
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Sep 16 19:44:10 2019 +0200
- up to 5.3.0
kernel-aufs5.patch | 604 +++++++++++++++++++-------------------
kernel-multiarch.config | 282 ++++++++++++------
kernel-pom-ng-IPV4OPTSSTRIP.patch | 2 +-
kernel-small_fixes.patch | 174 +----------
kernel-x86.config | 3 +-
kernel.spec | 17 +-
xfs-reclaim-hack.patch | 6 +-
7 files changed, 511 insertions(+), 577 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 4f787fc5..d732b72a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,8 +68,8 @@
%endif
%define rel 1
-%define basever 5.2
-%define postver .14
+%define basever 5.3
+%define postver .0
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -120,7 +120,7 @@ Epoch: 3
License: GPL v2
Group: Base/Kernel
Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: ddf994de00d7b18395886dd9b30b9262
+# Source0-md5: c99feaade8047339528fb066ec5f8a49
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
# Patch0-md5: cdaffbebb53e51b862ba1b959a0da859
@@ -690,7 +690,7 @@ rm -f localversion-rt
%endif # vanilla
# Small fixes:
-%patch2000 -p1
+#%patch2000 -p1
%patch2001 -p1
#%patch2003 -p1
%patch2004 -p1
@@ -1250,8 +1250,8 @@ fi
%if %{without rescuecd}
%exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
%exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/avm_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/b1pcmcia.ko*
%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko*
%endif
%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
@@ -1331,8 +1331,8 @@ fi
%exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
%if %{without rescuecd}
/lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/avm_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/b1pcmcia.ko*
/lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
%endif
/lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
@@ -1438,7 +1438,6 @@ fi
%{_docdir}/%{name}-%{version}/[!jkz]*
%{_docdir}/%{name}-%{version}/[jkz]*.txt
%{_docdir}/%{name}-%{version}/kbuild
-%{_docdir}/%{name}-%{version}/kdump
%{_docdir}/%{name}-%{version}/kernel-hacking
%endif
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 8dcd629f..d352d1e8 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index f1046cf6ad85..95c957c2e2c3 100644
+index bfb1c6095c7a..bddba5bb307e 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -262,6 +262,7 @@ source "fs/romfs/Kconfig"
+@@ -261,6 +261,7 @@ source "fs/romfs/Kconfig"
source "fs/pstore/Kconfig"
source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
@@ -14,7 +14,7 @@ index f1046cf6ad85..95c957c2e2c3 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index c9aea23aba56..57c6f47b0185 100644
+index d60089fd689b..924c16a40b00 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -130,3 +130,4 @@ obj-$(CONFIG_F2FS_FS) += f2fs/
@@ -26,10 +26,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index a6954776a37e..c30c2d323711 100644
+index 9cbcf167bdd0..5a9cee826a8f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2769,6 +2769,19 @@ F: include/linux/audit.h
+@@ -2822,6 +2822,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
@@ -50,10 +50,10 @@ index a6954776a37e..c30c2d323711 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 f11b7dc16e9d..1b723737592b 100644
+index ab7ca5989097..80d06084b043 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -746,6 +746,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
return error;
}
@@ -79,10 +79,10 @@ index f11b7dc16e9d..1b723737592b 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
-index c435398f2c81..a688a042d022 100644
+index e88cf0554e65..7ce4ccf5a51c 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1247,7 +1247,7 @@ enum d_walk_ret {
+@@ -1264,7 +1264,7 @@ enum d_walk_ret {
*
* The @enter() callbacks are called with d_lock held.
*/
@@ -114,7 +114,7 @@ index 3d40771e8e7c..d62303c5472a 100644
return error;
diff --git a/fs/inode.c b/fs/inode.c
-index df6542ec3b88..407d7b45e2ee 100644
+index 0f1e3b563c47..43df8452f97d 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1670,7 +1670,7 @@ EXPORT_SYMBOL(generic_update_time);
@@ -127,10 +127,10 @@ index df6542ec3b88..407d7b45e2ee 100644
int (*update_time)(struct inode *, struct timespec64 *, int);
diff --git a/fs/namespace.c b/fs/namespace.c
-index b26778bdc236..b460383a4228 100644
+index d28d30b13043..34c8093ddb1d 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -770,6 +770,12 @@ static inline int check_mnt(struct mount *mnt)
+@@ -776,6 +776,12 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns;
}
@@ -144,7 +144,7 @@ index b26778bdc236..b460383a4228 100644
* vfsmount lock must be held for write
*/
diff --git a/fs/read_write.c b/fs/read_write.c
-index c543d965e288..35ab54e0a994 100644
+index 5bbf587f5bc1..3265bb84f152 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -498,6 +498,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p,
@@ -177,7 +177,7 @@ index c543d965e288..35ab54e0a994 100644
{
mm_segment_t old_fs;
diff --git a/fs/splice.c b/fs/splice.c
-index 14cb602d9a2f..58d2692c5f30 100644
+index 98412721f056..75b489fcb66f 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -834,8 +834,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
@@ -218,10 +218,10 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644
if (wait)
sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index f7fdfe93e25d..28593b894e7b 100644
+index 997a530ff4e9..3dbec51c2037 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1333,6 +1333,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1331,6 +1331,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int);
@@ -229,7 +229,7 @@ index f7fdfe93e25d..28593b894e7b 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);
-@@ -1812,6 +1813,7 @@ struct file_operations {
+@@ -1810,6 +1811,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 f7fdfe93e25d..28593b894e7b 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);
-@@ -1882,6 +1884,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -1880,6 +1882,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 f7fdfe93e25d..28593b894e7b 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 *);
-@@ -2315,6 +2323,7 @@ extern int current_umask(void);
+@@ -2298,6 +2306,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 f7fdfe93e25d..28593b894e7b 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
-@@ -2603,6 +2612,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2586,6 +2595,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false;
}
#endif
@@ -267,10 +267,10 @@ index f7fdfe93e25d..28593b894e7b 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 6e2377e6c1d6..5a945d18a72a 100644
+index 0b0d7259276d..12d18e180348 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
-@@ -325,6 +325,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
+@@ -334,6 +334,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key;
}
@@ -279,7 +279,7 @@ index 6e2377e6c1d6..5a945d18a72a 100644
/*
* Acquire a lock.
*
-@@ -463,6 +465,7 @@ struct lockdep_map { };
+@@ -476,6 +478,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0)
@@ -322,21 +322,21 @@ index 74b4911ac16d..19789fbea567 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index c47788fa85f9..3c35a1059890 100644
+index 4861cf8e274b..ec87ccf82025 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -152,7 +152,7 @@ static
- #endif
+@@ -153,7 +153,7 @@ static
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
+ static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
-static inline struct lock_class *hlock_class(struct held_lock *hlock)
+inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
{
- if (!hlock->class_idx) {
- /*
-@@ -163,6 +163,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
- }
- return lock_classes + hlock->class_idx - 1;
+ unsigned int class_idx = hlock->class_idx;
+
+@@ -174,6 +174,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
+ */
+ return lock_classes + class_idx;
}
+#define hlock_class(hlock) lockdep_hlock_class(hlock)
@@ -346,11 +346,11 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 9c8ca6cd3ce4..2ae2c94aceca 100644
+index ebea9501afb8..dc7edc5f7267 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
-@@ -2014,7 +2014,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
- down_read(&mm->mmap_sem);
+@@ -2037,7 +2037,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+ rc = -ENOENT;
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
- *path = vma->vm_file->f_path;
@@ -375,10 +375,10 @@ index 14c2badb8fd9..65afe5287e43 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 01d4eb0e6bd1..fedfaa012768 100644
+index 731642e0f5a0..e8d6259de65b 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
-@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
const char *name = NULL;
if (file) {
@@ -390,7 +390,7 @@ index 01d4eb0e6bd1..fedfaa012768 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1761,7 +1764,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1807,7 +1810,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
@@ -400,7 +400,7 @@ index 01d4eb0e6bd1..fedfaa012768 100644
struct mm_walk walk = {
.hugetlb_entry = gather_hugetlb_stats,
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 36bf0f2e102e..8df6cbc58756 100644
+index 7907e6419e57..d17209cf52bc 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
@@ -416,10 +416,10 @@ index 36bf0f2e102e..8df6cbc58756 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 0e8834ac32b7..b3f42f01aaf0 100644
+index 0334ca97c584..3bdae823daee 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1542,6 +1542,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1538,6 +1538,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
@@ -449,10 +449,10 @@ index 0e8834ac32b7..b3f42f01aaf0 100644
void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 8ec38b11b361..d3f5492a2611 100644
+index 6a7a1083b6fb..461db8843e32 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -253,6 +253,7 @@ struct vm_region {
+@@ -262,6 +262,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */
@@ -460,19 +460,19 @@ index 8ec38b11b361..d3f5492a2611 100644
int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -327,6 +328,7 @@ struct vm_area_struct {
+@@ -336,6 +337,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */
struct file * vm_file; /* File we map to (can be NULL). */
+ struct file *vm_prfile; /* shadow of vm_file */
void * vm_private_data; /* was vm_pte (shared mem) */
- atomic_long_t swap_readahead_info;
+ #ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
-index 75675b9bf6df..dc333a5e6926 100644
+index 2852d0e76ea3..7b7f676b6465 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -549,7 +549,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -553,7 +553,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,23 +482,23 @@ index 75675b9bf6df..dc333a5e6926 100644
atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping);
diff --git a/mm/Makefile b/mm/Makefile
-index ac5e5ba78874..5decb22d13a0 100644
+index d0b295c3b764..6156cd3d1ab0 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
mm_init.o mmu_context.o percpu.o slab_common.o \
compaction.o vmacache.o \
interval_tree.o list_lru.o workingset.o \
-- debug.o $(mmu-y)
-+ prfile.o debug.o $(mmu-y)
+- debug.o gup.o $(mmu-y)
++ prfile.o debug.o gup.o $(mmu-y)
# 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 df2006ba0cfa..d5221dedfe56 100644
+index d0cf700bf201..5cac93e7bf67 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -2671,7 +2671,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -2721,7 +2721,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);
@@ -605,10 +605,10 @@ index 7e8c3e8ae75f..d8a903f61262 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 d8c02fbe03b5..22dae8b7216a 100644
+index fed1b6e9c89b..0d43b248ed54 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
-@@ -640,7 +640,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -552,7 +552,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);
if (region->vm_file)
@@ -617,7 +617,7 @@ index d8c02fbe03b5..22dae8b7216a 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
-@@ -778,7 +778,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -690,7 +690,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 d8c02fbe03b5..22dae8b7216a 100644
put_nommu_region(vma->vm_region);
vm_area_free(vma);
}
-@@ -1301,7 +1301,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1213,7 +1213,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
@@ -635,7 +635,7 @@ index d8c02fbe03b5..22dae8b7216a 100644
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
-@@ -1376,10 +1376,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1290,10 +1290,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem);
error:
if (region->vm_file)
@@ -744,10 +744,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
-index a688a042d022..3fc74e471924 100644
+index 7ce4ccf5a51c..00d7e6a08026 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1352,6 +1352,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1369,6 +1369,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
@@ -755,7 +755,7 @@ index a688a042d022..3fc74e471924 100644
struct check_mount {
struct vfsmount *mnt;
-@@ -2850,6 +2851,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2914,6 +2915,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock);
}
@@ -764,7 +764,7 @@ index a688a042d022..3fc74e471924 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
-index 89a500bb897a..1a722915ed77 100644
+index f7f6a140856a..1a740f3c42ba 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -110,6 +110,7 @@ bool path_noexec(const struct path *path)
@@ -816,7 +816,7 @@ index b07b53f24ff5..34b9bbf4c556 100644
void __init files_init(void)
{
diff --git a/fs/inode.c b/fs/inode.c
-index 407d7b45e2ee..b4d3e100abd0 100644
+index 43df8452f97d..8a5c14630ff0 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1679,6 +1679,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
@@ -828,10 +828,10 @@ index 407d7b45e2ee..b4d3e100abd0 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
-index b460383a4228..b74d15701ed7 100644
+index 34c8093ddb1d..2b64af58b643 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -436,6 +436,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
+@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
mnt_dec_writers(real_mount(mnt));
preempt_enable();
}
@@ -839,7 +839,7 @@ index b460383a4228..b74d15701ed7 100644
/**
* mnt_drop_write - give up write access to a mount
-@@ -775,6 +776,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
+@@ -781,6 +782,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
{
return check_mnt(real_mount(mnt));
}
@@ -847,7 +847,7 @@ index b460383a4228..b74d15701ed7 100644
/*
* vfsmount lock must be held for write
-@@ -1908,6 +1910,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1900,6 +1902,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
@@ -884,7 +884,7 @@ index 0391190305cc..0b9f7f6d8390 100644
int fsnotify_fasync(int fd, struct file *file, int on)
{
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 25eb247ea85a..6a2a2f722eae 100644
+index 99ddd126f6f0..2154d69a2c7a 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -276,6 +276,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
@@ -903,7 +903,7 @@ index 25eb247ea85a..6a2a2f722eae 100644
/*
* Sorting function for lists of fsnotify marks.
-@@ -677,6 +679,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp,
+@@ -685,6 +687,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp,
mutex_unlock(&group->mark_mutex);
return ret;
}
@@ -911,7 +911,7 @@ index 25eb247ea85a..6a2a2f722eae 100644
/*
* Given a list of marks, find the mark associated with given group. If found
-@@ -801,6 +804,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+@@ -809,6 +812,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
mark->group = group;
WRITE_ONCE(mark->connector, NULL);
}
@@ -920,7 +920,7 @@ index 25eb247ea85a..6a2a2f722eae 100644
/*
* Destroy all marks in destroy_list, waits for SRCU period to finish before
diff --git a/fs/open.c b/fs/open.c
-index b5b80469b93d..eb818f6b9519 100644
+index a59abe3c669a..78809163ba03 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@@ -932,7 +932,7 @@ index b5b80469b93d..eb818f6b9519 100644
long vfs_truncate(const struct path *path, loff_t length)
{
diff --git a/fs/read_write.c b/fs/read_write.c
-index 35ab54e0a994..9da238d64ea4 100644
+index 3265bb84f152..5b2dbddb0efe 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
@@ -968,7 +968,7 @@ index 35ab54e0a994..9da238d64ea4 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 58d2692c5f30..4fe4afa7f6b1 100644
+index 75b489fcb66f..0a1f7498c22b 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,
@@ -1012,12 +1012,12 @@ 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 3c35a1059890..67dccde036a2 100644
+index ec87ccf82025..739d1c8a81f5 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -163,6 +163,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
- }
- return lock_classes + hlock->class_idx - 1;
+@@ -174,6 +174,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+ */
+ return lock_classes + class_idx;
}
+EXPORT_SYMBOL_GPL(lockdep_hlock_class);
#define hlock_class(hlock) lockdep_hlock_class(hlock)
@@ -1033,7 +1033,7 @@ index 0fef395662a6..83fb1ecfc33d 100644
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index dc28914fa72e..c2ddfea2b280 100644
+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,
@@ -1042,10 +1042,10 @@ index dc28914fa72e..c2ddfea2b280 100644
}
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c
-index f493db0bf62a..96f118be469f 100644
+index 250ee2d76406..2765042d4846 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -993,6 +993,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -996,6 +996,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
}
@@ -1053,7 +1053,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry)
{
-@@ -1009,6 +1010,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1012,6 +1013,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name);
}
@@ -1061,7 +1061,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
-@@ -1017,6 +1019,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1020,6 +1022,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
}
@@ -1069,7 +1069,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
-@@ -1044,6 +1047,7 @@ int security_path_truncate(const struct path *path)
+@@ -1047,6 +1050,7 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
@@ -1077,7 +1077,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_chmod(const struct path *path, umode_t mode)
{
-@@ -1051,6 +1055,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1054,6 +1058,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
@@ -1085,7 +1085,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
-@@ -1058,6 +1063,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1061,6 +1066,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
return 0;
return call_int_hook(path_chown, 0, path, uid, gid);
}
@@ -1093,7 +1093,7 @@ index f493db0bf62a..96f118be469f 100644
int security_path_chroot(const struct path *path)
{
-@@ -1158,6 +1164,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -1161,6 +1167,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return call_int_hook(inode_permission, 0, inode, mask);
}
@@ -1101,7 +1101,7 @@ index f493db0bf62a..96f118be469f 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
-@@ -1335,6 +1342,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -1338,6 +1345,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
@@ -1110,8 +1110,8 @@ index f493db0bf62a..96f118be469f 100644
int security_file_alloc(struct file *file)
{
diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs
---- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01 08:00:00.000000000 +0800
-+++ linux/Documentation/ABI/testing/debugfs-aufs 2019-07-11 21:21:54.375717654 +0800
+--- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs 2019-07-11 15:42:14.455570938 +0200
@@ -0,0 +1,55 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@@ -1169,8 +1169,8 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Document
+ When the aufs mount option 'noxino' is specified, it
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
---- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01 08:00:00.000000000 +0800
-+++ linux/Documentation/ABI/testing/sysfs-aufs 2019-07-11 21:21:54.375717654 +0800
+--- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs 2019-07-11 15:42:14.455570938 +0200
@@ -0,0 +1,31 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@@ -1204,8 +1204,8 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentat
+ When the aufs mount option 'noxino' is specified, it
+ 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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,171 @@
+
+# Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -1379,8 +1379,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt lin
+helper, instead of doing in kernel space. Actually I am still thinking
+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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,258 @@
+
+# Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -1641,8 +1641,8 @@ 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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,85 @@
+
+# Copyright (C) 2015-2019 Junjiro R. Okajima
@@ -1730,8 +1730,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.t
+ done by VFS:do_last(), lookup_open() and atomic_open(). some can
+ 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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,113 @@
+
+# Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -1847,8 +1847,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt li
+ aufs performance when system surely hide the aufs branches from user,
+ 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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,74 @@
+
+# Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -1925,8 +1925,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt li
+ - a regular file on the branch is opened for write and there is no
+ 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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,64 @@
+
+# Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -1993,8 +1993,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.tx
+ one. If the selected branch is readonly, then aufs follows the
+ copyup policy.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot linux/Documentation/filesystems/aufs/design/06dirren.dot
---- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot 1970-01-01 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2019-07-11 21:21:54.375717654 +0800
+--- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot 1970-01-01 01:00:00.000000000 +0100
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2019-07-11 15:42:14.458904362 +0200
@@ -0,0 +1,31 @@
+
+// to view this graph, run dot(1) command in GRAPHVIZ.
@@ -2028,8 +2028,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot li
+aufs_lookup -> whinfo [label="load/remove"];
+}
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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,102 @@
+
+# Copyright (C) 2017-2019 Junjiro R. Okajima
@@ -2134,8 +2134,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt li
+UDBA handler may not work correctly. In this case, the behaviour will be
+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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,120 @@
+
+# Copyright (C) 2011-2019 Junjiro R. Okajima
@@ -2258,8 +2258,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linu
+And of course, in every step, an error may happen. So the operation
+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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,72 @@
+
+# Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -2334,8 +2334,8 @@ 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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,96 @@
+
+# Copyright (C) 2014-2019 Junjiro R. Okajima
@@ -2434,8 +2434,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt lin
+Do we need another attribute to stop copying XATTR? I am unsure. For
+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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/07export.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,58 @@
+
+# Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -2496,8 +2496,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt li
+- readdir(): call lockdep_on/off() because filldir in NFSD calls
+ 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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,52 @@
+
+# Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -2552,8 +2552,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linu
+This new squashfs archive can be stored on the boot device and the
+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 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2019-07-11 21:21:54.375717654 +0800
+--- /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
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2010-2019 Junjiro R. Okajima
@@ -2603,8 +2603,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt lin
+Currently this approach is applied to address_space_operations for
+regular files only.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
---- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01 08:00:00.000000000 +0800
-+++ linux/Documentation/filesystems/aufs/README 2019-07-11 21:21:54.375717654 +0800
+--- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
++++ linux/Documentation/filesystems/aufs/README 2019-07-11 15:42:14.455570938 +0200
@@ -0,0 +1,399 @@
+
+Aufs5 -- advanced multi layered unification filesystem version 5.x
@@ -3006,8 +3006,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta
+# mode: text;
+# 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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/aufs.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -3072,9 +3072,9 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/branch.c 2019-07-11 21:21:54.379051070 +0800
-@@ -0,0 +1,1423 @@
+--- /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
+@@ -0,0 +1,1428 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -4295,6 +4295,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
+ unsigned char verbose, writer;
+ struct file *file, *hf, **array;
+ struct au_hfile *hfile;
++ struct inode *h_inode;
+
+ mnt_flags = au_mntflags(sb);
+ verbose = !!au_opt_test(mnt_flags, VERBOSE);
@@ -4365,8 +4366,12 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
+ hf->f_mode &= ~(FMODE_WRITE | FMODE_WRITER);
+ spin_unlock(&hf->f_lock);
+ if (writer) {
-+ put_write_access(file_inode(hf));
++ h_inode = file_inode(hf);
++ put_write_access(h_inode);
+ __mnt_drop_write(hf->f_path.mnt);
++ if ((hf->f_mode & (FMODE_READ | FMODE_WRITE))
++ == FMODE_READ)
++ i_readcount_inc(h_inode);
+ }
+ }
+
@@ -4499,8 +4504,8 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
---- /usr/share/empty/fs/aufs/branch.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/branch.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,366 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -4869,8 +4874,8 @@ diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
+#endif /* __KERNEL__ */
+#endif /* __AUFS_BRANCH_H__ */
diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
---- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/conf.mk 2019-07-11 21:21:54.379051070 +0800
+--- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/conf.mk 2019-07-11 15:42:14.462237786 +0200
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -4913,8 +4918,8 @@ 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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/cpup.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,1458 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -6375,8 +6380,8 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
---- /usr/share/empty/fs/aufs/cpup.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/cpup.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,100 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -6479,8 +6484,8 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dbgaufs.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,526 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -7009,8 +7014,8 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
---- /usr/share/empty/fs/aufs/dbgaufs.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dbgaufs.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -7066,8 +7071,8 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dcsub.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -7295,8 +7300,8 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
+ return path_is_under(path + 0, path + 1);
+}
diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
---- /usr/share/empty/fs/aufs/dcsub.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dcsub.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,137 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -7436,8 +7441,8 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/debug.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,441 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -7881,8 +7886,8 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
+ return 0;
+}
diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
---- /usr/share/empty/fs/aufs/debug.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/debug.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,226 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -8111,8 +8116,8 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dentry.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,1154 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -9269,8 +9274,8 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
+ .d_release = aufs_d_release
+};
diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
---- /usr/share/empty/fs/aufs/dentry.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dentry.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,268 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -9541,8 +9546,8 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dinfo.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,554 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -10099,8 +10104,8 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
+ return -1;
+}
diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
---- /usr/share/empty/fs/aufs/dir.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dir.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,763 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -10866,8 +10871,8 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
+ .fsync = aufs_fsync_dir
+};
diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
---- /usr/share/empty/fs/aufs/dir.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dir.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,134 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -11004,8 +11009,8 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dirren.c 2019-07-11 21:21:54.379051070 +0800
+--- /usr/share/empty/fs/aufs/dirren.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/dirren.c 2019-07-11 15:42:14.462237786 +0200
@@ -0,0 +1,1316 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -12324,8 +12329,8 @@ diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
---- /usr/share/empty/fs/aufs/dirren.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dirren.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -12468,8 +12473,8 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dynop.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,367 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -12839,8 +12844,8 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
+ WARN_ON(!hlist_bl_empty(dynop + i));
+}
diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
---- /usr/share/empty/fs/aufs/dynop.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/dynop.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -12920,8 +12925,8 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/export.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,838 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -13762,8 +13767,8 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
+ atomic_set(&sbinfo->si_xigen_next, u);
+}
diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
---- /usr/share/empty/fs/aufs/fhsm.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/fhsm.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -14193,8 +14198,8 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
+ seq_printf(seq, ",fhsm_sec=%u", u);
+}
diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
---- /usr/share/empty/fs/aufs/file.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/file.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,863 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -15060,8 +15065,8 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
+#endif /* CONFIG_AUFS_DEBUG */
+};
diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
---- /usr/share/empty/fs/aufs/file.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/file.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,342 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -15406,8 +15411,8 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/finfo.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -15559,8 +15564,8 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
+ return err;
+}
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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/f_op.c 2019-07-11 21:21:54.379051070 +0800
+--- /usr/share/empty/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/f_op.c 2019-07-11 15:42:14.465571210 +0200
@@ -0,0 +1,819 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -16382,8 +16387,8 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
+ .copy_file_range = aufs_copy_file_range
+};
diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
---- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/fstype.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,401 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -16787,8 +16792,8 @@ diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/hbl.h 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -16856,8 +16861,8 @@ diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/hfsnotify.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,288 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -17148,8 +17153,8 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
+ .init_br = au_hfsn_init_br
+};
diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
---- /usr/share/empty/fs/aufs/hfsplus.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/hfsplus.c 2019-07-11 21:21:54.379051070 +0800
+--- /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
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -17212,8 +17217,8 @@ diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
+ }
+}
diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
---- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/hnotify.c 2019-07-11 21:21:54.379051070 +0800
+--- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/hnotify.c 2019-07-11 15:42:14.465571210 +0200
@@ -0,0 +1,721 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -17937,8 +17942,8 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
+ au_hn_destroy_cache();
+}
diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
---- /usr/share/empty/fs/aufs/iinfo.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/iinfo.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,286 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -18227,8 +18232,8 @@ diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
+ AuRwDestroy(&iinfo->ii_rwsem);
+}
diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
---- /usr/share/empty/fs/aufs/inode.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/inode.c 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/inode.c 2019-07-11 15:42:14.468904634 +0200
@@ -0,0 +1,529 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -18760,8 +18765,8 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
+ return au_test_h_perm(h_inode, mask);
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
---- /usr/share/empty/fs/aufs/inode.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/inode.h 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/inode.h 2019-07-11 15:42:14.468904634 +0200
@@ -0,0 +1,698 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -19462,8 +19467,8 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/ioctl.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,220 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -19686,8 +19691,8 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
+}
+#endif
diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
---- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/i_op_add.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,936 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -20626,9 +20631,9 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+ return err;
+}
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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/i_op.c 2019-07-11 21:21:54.379051070 +0800
-@@ -0,0 +1,1507 @@
+--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/i_op.c 2019-09-16 09:38:43.216175640 +0200
+@@ -0,0 +1,1505 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -21271,9 +21276,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
+
+static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task)
+{
-+#if !defined(CONFIG_RWSEM_GENERIC_SPINLOCK) && defined(CONFIG_RWSEM_SPIN_ON_OWNER)
-+ p->hdir->hi_inode->i_rwsem.owner = task;
-+#endif
++ atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, (long)task);
+}
+
+void au_pin_hdir_acquire_nest(struct au_pin *p)
@@ -22137,8 +22140,8 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
+ }
+};
diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
---- /usr/share/empty/fs/aufs/i_op_del.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/i_op_del.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,513 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -22654,8 +22657,8 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
+ return err;
+}
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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/i_op_ren.c 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/i_op_ren.c 2019-07-11 15:42:14.468904634 +0200
@@ -0,0 +1,1250 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -23908,8 +23911,8 @@ diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
---- /usr/share/empty/fs/aufs/Kconfig 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/Kconfig 2019-07-11 21:21:54.379051070 +0800
+--- /usr/share/empty/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/Kconfig 2019-07-11 15:42:14.458904362 +0200
@@ -0,0 +1,199 @@
+# SPDX-License-Identifier: GPL-2.0
+config AUFS_FS
@@ -24111,8 +24114,8 @@ diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
+ When aufs supports Magic SysRq, enabled automatically.
+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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/lcnt.h 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,186 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -24301,8 +24304,8 @@ diff -urN /usr/share/empty/fs/aufs/lcnt.h linux/fs/aufs/lcnt.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/loop.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -24453,8 +24456,8 @@ diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
+ au_kfree_try_rcu(au_warn_loopback_array);
+}
diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
---- /usr/share/empty/fs/aufs/loop.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/loop.h 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -24512,8 +24515,8 @@ diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
+#endif /* __KERNEL__ */
+#endif /* __AUFS_LOOP_H__ */
diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
---- /usr/share/empty/fs/aufs/magic.mk 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/magic.mk 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/magic.mk 2019-07-11 15:42:14.468904634 +0200
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -24547,8 +24550,8 @@ diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
+ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b
+endif
diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
---- /usr/share/empty/fs/aufs/Makefile 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/Makefile 2019-07-11 21:21:54.379051070 +0800
+--- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/Makefile 2019-07-11 15:42:14.462237786 +0200
@@ -0,0 +1,46 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -24597,8 +24600,8 @@ diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
+aufs-$(CONFIG_AUFS_DEBUG) += debug.o
+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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/module.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -24874,8 +24877,8 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
+module_init(aufs_init);
+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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/module.h 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,166 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -25044,8 +25047,8 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/mvdown.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,706 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -25754,9 +25757,9 @@ diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
---- /usr/share/empty/fs/aufs/opts.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/opts.c 2019-07-11 21:21:54.382384486 +0800
-@@ -0,0 +1,1877 @@
+--- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/opts.c 2019-09-16 09:38:43.216175640 +0200
+@@ -0,0 +1,1880 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima
@@ -27145,6 +27148,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
+ case Opt_wsum:
+ au_opt_clr(sbinfo->si_mntflags, SUM);
+ au_opt_set(sbinfo->si_mntflags, SUM_W);
++ break;
+ case Opt_nosum:
+ au_opt_clr(sbinfo->si_mntflags, SUM);
+ au_opt_clr(sbinfo->si_mntflags, SUM_W);
@@ -27270,8 +27274,10 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
+ if (opt->add.bindex < 0)
+ opt->add.bindex = 0;
+ goto add;
++ /* Always goto add, not fallthrough */
+ case Opt_prepend:
+ opt->add.bindex = 0;
++ /* fallthrough */
+ add: /* indented label */
+ case Opt_add:
+ err = au_br_add(sb, &opt->add,
@@ -27635,8 +27641,8 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
+ return au_mntflags(sb) & AuOptMask_UDBA;
+}
diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
---- /usr/share/empty/fs/aufs/opts.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/opts.h 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,225 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -27864,8 +27870,8 @@ diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/plink.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,516 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -28384,8 +28390,8 @@ 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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/poll.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -28439,8 +28445,8 @@ diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
+ return mask;
+}
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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/posix_acl.c 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/posix_acl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/posix_acl.c 2019-07-11 15:42:14.472238057 +0200
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -28546,8 +28552,8 @@ diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
---- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/procfs.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -28721,8 +28727,8 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
---- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/rdu.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,384 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -29109,8 +29115,8 @@ 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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/rwsem.h 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,73 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -29186,8 +29192,8 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/sbinfo.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,314 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -29504,8 +29510,8 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
+ si_read_unlock(d1->d_sb);
+}
diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
---- /usr/share/empty/fs/aufs/super.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/super.c 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/super.c 2019-07-11 15:42:14.472238057 +0200
@@ -0,0 +1,1047 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -30555,8 +30561,8 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
+ .owner = THIS_MODULE,
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
---- /usr/share/empty/fs/aufs/super.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/super.h 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/super.h 2019-07-11 15:42:14.472238057 +0200
@@ -0,0 +1,589 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -31148,8 +31154,8 @@ diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/sysaufs.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -31245,8 +31251,8 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
---- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/sysaufs.h 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,102 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -31351,8 +31357,8 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/sysfs.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,374 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -31729,8 +31735,8 @@ 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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/sysrq.c 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/sysrq.c 2019-07-11 15:42:14.475571481 +0200
@@ -0,0 +1,160 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -31893,8 +31899,8 @@ diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
+ pr_err("err %d (ignored)\n", err);
+}
diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
---- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/vdir.c 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/vdir.c 2019-07-11 15:42:14.475571481 +0200
@@ -0,0 +1,896 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -32793,8 +32799,8 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+ return 0;
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
---- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/vfsub.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,902 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -33699,8 +33705,8 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
---- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/vfsub.h 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,354 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -34057,8 +34063,8 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/wbr_policy.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -34891,8 +34897,8 @@ 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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/whout.c 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/whout.c 2019-07-11 15:42:14.475571481 +0200
@@ -0,0 +1,1062 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -35957,8 +35963,8 @@ 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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/whout.h 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,86 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -36047,8 +36053,8 @@ diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/wkq.c 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/wkq.c 2019-07-11 15:42:14.475571481 +0200
@@ -0,0 +1,392 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -36443,8 +36449,8 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
+ return err;
+}
diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
---- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/wkq.h 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -36536,8 +36542,8 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
+#endif /* __KERNEL__ */
+#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 08:00:00.000000000 +0800
-+++ linux/fs/aufs/xattr.c 2019-07-11 21:21:54.382384486 +0800
+--- /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
@@ -0,0 +1,356 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -36896,8 +36902,8 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
+ sb->s_xattr = au_xattr_handlers;
+}
diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
---- /usr/share/empty/fs/aufs/xino.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux/fs/aufs/xino.c 2019-07-11 21:21:54.382384486 +0800
+--- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
++++ linux/fs/aufs/xino.c 2019-07-11 15:42:14.475571481 +0200
@@ -0,0 +1,1965 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -38865,10 +38871,10 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
+ return err;
+}
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 08:00:00.000000000 +0800
-+++ linux/include/uapi/linux/aufs_type.h 2019-07-11 21:21:54.382384486 +0800
-@@ -0,0 +1,448 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
+--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
++++ linux/include/uapi/linux/aufs_type.h 2019-09-16 09:38:43.216175640 +0200
+@@ -0,0 +1,452 @@
++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima
+ *
@@ -38910,7 +38916,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+
+#include <linux/limits.h>
+
-+#define AUFS_VERSION "5.x-rcN-20190610"
++#define AUFS_VERSION "5.x-rcN-20190909"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39124,7 +39130,11 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+
+/* borrowed from linux/include/linux/kernel.h */
+#ifndef ALIGN
++#ifdef _GNU_SOURCE
+#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1)
++#else
++#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
++#endif
+#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask))
+#endif
+
@@ -39320,10 +39330,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 1b723737592b..16561a96019c 100644
+index 80d06084b043..a83cdfec7359 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -633,6 +633,15 @@ static inline void loop_update_dio(struct loop_device *lo)
+@@ -625,6 +625,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio);
}
@@ -39339,7 +39349,7 @@ index 1b723737592b..16561a96019c 100644
static void loop_reread_partitions(struct loop_device *lo,
struct block_device *bdev)
{
-@@ -686,6 +695,7 @@ static int loop_change_fd(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,
unsigned int arg)
{
struct file *file = NULL, *old_file;
@@ -39347,7 +39357,7 @@ index 1b723737592b..16561a96019c 100644
int error;
bool partscan;
-@@ -705,12 +715,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -697,12 +707,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
file = fget(arg);
if (!file)
goto out_err;
@@ -39367,7 +39377,7 @@ index 1b723737592b..16561a96019c 100644
error = -EINVAL;
-@@ -722,6 +739,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -714,6 +731,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;
@@ -39375,7 +39385,7 @@ index 1b723737592b..16561a96019c 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));
-@@ -735,6 +753,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -727,6 +745,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
@@ -39384,7 +39394,7 @@ index 1b723737592b..16561a96019c 100644
if (partscan)
loop_reread_partitions(lo, bdev);
return 0;
-@@ -743,6 +763,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -735,6 +755,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
mutex_unlock(&loop_ctl_mutex);
if (file)
fput(file);
@@ -39393,7 +39403,7 @@ index 1b723737592b..16561a96019c 100644
return error;
}
-@@ -947,7 +969,7 @@ static void loop_update_rotational(struct loop_device *lo)
+@@ -939,7 +961,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)
{
@@ -39401,8 +39411,8 @@ index 1b723737592b..16561a96019c 100644
+ struct file *file, *f, *virt_file = NULL;
struct inode *inode;
struct address_space *mapping;
- int lo_flags = 0;
-@@ -962,6 +984,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+ struct block_device *claimed_bdev = NULL;
+@@ -955,6 +977,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
file = fget(arg);
if (!file)
goto out;
@@ -39415,7 +39425,7 @@ index 1b723737592b..16561a96019c 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
-@@ -1009,6 +1037,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
+@@ -1003,6 +1031,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;
@@ -39423,8 +39433,8 @@ index 1b723737592b..16561a96019c 100644
lo->transfer = NULL;
lo->ioctl = NULL;
lo->lo_sizelimit = 0;
-@@ -1052,6 +1081,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
- blkdev_put(bdev, mode | FMODE_EXCL);
+@@ -1046,6 +1075,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);
+ if (virt_file)
@@ -39432,7 +39442,7 @@ index 1b723737592b..16561a96019c 100644
out:
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
-@@ -1098,6 +1129,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
+@@ -1092,6 +1123,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;
@@ -39440,7 +39450,7 @@ index 1b723737592b..16561a96019c 100644
gfp_t gfp = lo->old_gfp_mask;
struct block_device *bdev = lo->lo_device;
int err = 0;
-@@ -1121,6 +1153,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1115,6 +1147,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock);
lo->lo_backing_file = NULL;
@@ -39448,7 +39458,7 @@ index 1b723737592b..16561a96019c 100644
spin_unlock_irq(&lo->lo_lock);
loop_release_xfer(lo);
-@@ -1203,6 +1236,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
+@@ -1197,6 +1230,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release)
*/
if (filp)
fput(filp);
@@ -39546,10 +39556,10 @@ index a97e2921cb09..f74eb6962684 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 28593b894e7b..bdc2611787df 100644
+index 3dbec51c2037..38ab7b6c7c6d 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1947,6 +1947,10 @@ struct super_operations {
+@@ -1948,6 +1948,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 350a3bbf..fd431059 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -2,6 +2,7 @@
#-
#- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
#-
+ACRN_GUEST all=y
ARCH_MEMORY_PROBE all=n
DEBUG_ENTRY all=n
DEBUG_IMR_SELFTEST all=n
@@ -27,6 +28,7 @@ PERF_EVENTS_INTEL_UNCORE all=m
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
@@ -72,6 +74,7 @@ MQ_IOSCHED_DEADLINE all=y
MQ_IOSCHED_KYBER all=m
IOSCHED_BFQ all=m
BFQ_GROUP_IOSCHED all=y
+BFQ_CGROUP_DEBUG all=n
#-
#- *** FILE: block/partitions/Kconfig ***
@@ -182,6 +185,7 @@ CRYPTO_CRC32C all=m
CRYPTO_CRC32C_INTEL all=m
CRYPTO_CRC32 all=m
CRYPTO_CRC32_PCLMUL all=m
+CRYPTO_XXHASH all=m
CRYPTO_CRCT10DIF all=y
CRYPTO_CRCT10DIF_PCLMUL all=m
CRYPTO_GHASH all=m
@@ -539,6 +543,7 @@ DMA_FENCE_TRACE all=n
EXTRA_FIRMWARE all=""
FW_LOADER_USER_HELPER all=y
FW_LOADER_USER_HELPER_FALLBACK all=n
+FW_LOADER_COMPRESS all=y
#-
#- *** FILE: drivers/base/regmap/Kconfig ***
@@ -651,6 +656,7 @@ ZRAM_MEMORY_TRACKING all=y
BT_HCIBTUSB all=m
BT_HCIBTUSB_AUTOSUSPEND all=y
BT_HCIBTUSB_BCM all=y
+BT_HCIBTUSB_MTK all=y
BT_HCIBTUSB_RTL all=y
BT_HCIBTSDIO all=m
BT_HCIUART all=m
@@ -777,6 +783,7 @@ IPMI_SI all=m
IPMI_SSIF all=m
IPMI_WATCHDOG all=m
IPMI_POWEROFF all=m
+IPMB_DEVICE_INTERFACE all=m
#-
#- *** FILE: drivers/char/pcmcia/Kconfig ***
@@ -827,6 +834,7 @@ COMMON_CLK_WM831X all=m
#- file drivers/clk/versatile/Kconfig goes here
COMMON_CLK_MAX9485 all=m
COMMON_CLK_SCPI all=m
+COMMON_CLK_SI5341 all=m
COMMON_CLK_SI5351 all=m
COMMON_CLK_SI544 all=m
COMMON_CLK_CDCE706 all=m
@@ -939,6 +947,8 @@ CRYPTO_DEV_HIFN_795X_RNG all=y
CRYPTO_DEV_TALITOS all=m
#- file drivers/crypto/nx/Kconfig goes here
#- file drivers/crypto/ux500/Kconfig goes here
+CRYPTO_DEV_ATMEL_ECC all=m
+CRYPTO_DEV_ATMEL_SHA204A all=m
CRYPTO_DEV_CCP all=y
#- file drivers/crypto/ccp/Kconfig goes here
#- file drivers/crypto/qat/Kconfig goes here
@@ -1036,6 +1046,7 @@ TIMB_DMA all=m
#- file drivers/dma/mediatek/Kconfig goes here
#- file drivers/dma/qcom/Kconfig goes here
#- 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/sh/Kconfig goes here
#- file drivers/dma/ti/Kconfig goes here
@@ -1043,6 +1054,12 @@ TIMB_DMA all=m
ASYNC_TX_DMA all=y
DMATEST all=n
+#-
+#- *** FILE: drivers/dma/dw-edma/Kconfig ***
+#-
+DW_EDMA all=m
+DW_EDMA_PCIE all=m
+
#-
#- *** FILE: drivers/dma/dw/Kconfig ***
#-
@@ -1112,6 +1129,7 @@ EISA_NAMES alpha=y i386=y
EXTCON_ADC_JACK all=m
EXTCON_ARIZONA all=m
EXTCON_AXP288 all=m
+EXTCON_FSA9480 all=m
EXTCON_GPIO all=m
EXTCON_INTEL_INT3496 all=m
EXTCON_MAX14577 all=m
@@ -1183,15 +1201,6 @@ GOOGLE_FRAMEBUFFER_COREBOOT all=m
GOOGLE_MEMCONSOLE_COREBOOT all=m
GOOGLE_VPD all=m
-#-
-#- *** FILE: drivers/fmc/Kconfig ***
-#-
-FMC all=m
-FMC_FAKEDEV all=m
-FMC_TRIVIAL all=m
-FMC_WRITE_EEPROM all=m
-FMC_CHARDEV all=m
-
#-
#- *** FILE: drivers/fpga/Kconfig ***
#-
@@ -1248,7 +1257,7 @@ GPIO_MENZ127 all=m
GPIO_SIOX all=m
GPIO_STA2X11 all=y
GPIO_VX855 all=m
-GPIO_XILINX powerpc=y
+GPIO_XILINX all=m
GPIO_ZX all=y
GPIO_AMD_FCH all=m
GPIO_104_DIO_48E all=m
@@ -1353,6 +1362,7 @@ DRM_VKMS all=m
#- file drivers/gpu/drm/bridge/Kconfig goes here
#- file drivers/gpu/drm/sti/Kconfig goes here
#- file drivers/gpu/drm/imx/Kconfig goes here
+#- file drivers/gpu/drm/ingenic/Kconfig goes here
#- file drivers/gpu/drm/v3d/Kconfig goes here
#- file drivers/gpu/drm/vc4/Kconfig goes here
#- file drivers/gpu/drm/etnaviv/Kconfig goes here
@@ -1370,6 +1380,7 @@ DRM_VKMS all=m
#- file drivers/gpu/drm/lima/Kconfig goes here
#- file drivers/gpu/drm/panfrost/Kconfig goes here
#- file drivers/gpu/drm/aspeed/Kconfig goes here
+#- file drivers/gpu/drm/mcde/Kconfig goes here
DRM_LEGACY all=n
DRM_TDFX all=m
DRM_R128 all=m
@@ -1405,6 +1416,8 @@ HSA_AMD all=y
#-
DRM_AMD_DC all=y
DRM_AMD_DC_DCN1_0 all=y
+DRM_AMD_DC_DCN2_0 all=y
+DRM_AMD_DC_DSC_SUPPORT all=y
DEBUG_KERNEL_DC all=n
#-
@@ -1466,12 +1479,14 @@ DRM_I2C_NXP_TDA9950 all=m
#-
DRM_I915 i386=m x86_64=m
DRM_I915_ALPHA_SUPPORT all=n
+DRM_I915_FORCE_PROBE all=""
DRM_I915_CAPTURE_ERROR all=y
DRM_I915_COMPRESS_ERROR all=y
DRM_I915_USERPTR all=y
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/mgag200/Kconfig ***
@@ -1887,6 +1902,7 @@ SENSORS_ADM1275 all=m
SENSORS_IBM_CFFPS all=m
SENSORS_IR35221 all=m
SENSORS_IR38064 all=m
+SENSORS_IRPS5401 all=m
SENSORS_ISL68137 all=m
SENSORS_LM25066 all=m
SENSORS_LTC2978 all=m
@@ -1897,6 +1913,7 @@ SENSORS_MAX20751 all=m
SENSORS_MAX31785 all=m
SENSORS_MAX34440 all=m
SENSORS_MAX8688 all=m
+SENSORS_PXE1610 all=m
SENSORS_TPS40422 all=m
SENSORS_TPS53679 all=m
SENSORS_UCD9000 all=m
@@ -2048,7 +2065,7 @@ DW_I3C_MASTER all=m
#-
#* on PowerPC IDE must be 'y' to be able to select BLK_DEV_IDE_PMAC
IDE all=m ppc=y ppc64=y sparc=n
-#- Please see Documentation/ide/ide.txt for help/info on IDE drives
+#- Please see Documentation/ide/ide.rst for help/info on IDE drives
BLK_DEV_IDE_SATA all=n
IDE_GD all=m
IDE_GD_ATA all=y
@@ -2247,6 +2264,7 @@ TI_ADS7950 all=m
TI_AM335X_ADC all=m
TI_TLC4541 all=m
VIPERBOARD_ADC all=m
+XILINX_XADC all=m
#-
#- *** FILE: drivers/iio/amplifiers/Kconfig ***
@@ -2277,6 +2295,7 @@ VZ89X all=m
#-
IIO_CROS_EC_SENSORS_CORE all=m
IIO_CROS_EC_SENSORS all=m
+IIO_CROS_EC_SENSORS_LID_ANGLE all=m
#-
#- *** FILE: drivers/iio/common/ssp_sensors/Kconfig ***
@@ -2332,6 +2351,7 @@ IIO_SIMPLE_DUMMY_BUFFER all=y
#-
AD9523 all=m
ADF4350 all=m
+ADF4371 all=m
#-
#- *** FILE: drivers/iio/gyro/Kconfig ***
@@ -2493,6 +2513,7 @@ LMP91000 all=m
ABP060MG all=m
BMP280 all=m
IIO_CROS_EC_BARO all=m
+DPS310 all=m
HID_SENSOR_PRESS all=m
HP03 all=m
MPL115 all=m
@@ -2566,7 +2587,6 @@ INFINIBAND_ADDR_TRANS all=y sparc=
#- file drivers/infiniband/hw/i40iw/Kconfig goes here
#- file drivers/infiniband/hw/mlx4/Kconfig goes here
#- file drivers/infiniband/hw/mlx5/Kconfig goes here
-#- file drivers/infiniband/hw/nes/Kconfig goes here
#- file drivers/infiniband/hw/ocrdma/Kconfig goes here
#- file drivers/infiniband/hw/vmw_pvrdma/Kconfig goes here
#- file drivers/infiniband/hw/usnic/Kconfig goes here
@@ -2576,6 +2596,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
#- file drivers/infiniband/hw/qedr/Kconfig goes here
#- file drivers/infiniband/sw/rdmavt/Kconfig goes here
#- file drivers/infiniband/sw/rxe/Kconfig goes here
+#- file drivers/infiniband/sw/siw/Kconfig goes here
#- file drivers/infiniband/ulp/ipoib/Kconfig goes here
#- file drivers/infiniband/ulp/srp/Kconfig goes here
#- file drivers/infiniband/ulp/srpt/Kconfig goes here
@@ -2630,12 +2651,6 @@ MLX5_INFINIBAND all=m
#-
INFINIBAND_MTHCA all=m sparc=
-#-
-#- *** FILE: drivers/infiniband/hw/nes/Kconfig ***
-#-
-INFINIBAND_NES all=m sparc=
-INFINIBAND_NES_DEBUG all=n
-
#-
#- *** FILE: drivers/infiniband/hw/ocrdma/Kconfig ***
#-
@@ -2672,6 +2687,11 @@ INFINIBAND_RDMAVT all=m
#-
RDMA_RXE all=m
+#-
+#- *** FILE: drivers/infiniband/sw/siw/Kconfig ***
+#-
+RDMA_SIW all=m
+
#-
#- *** FILE: drivers/infiniband/ulp/ipoib/Kconfig ***
#-
@@ -2792,6 +2812,7 @@ INPUT_KEYBOARD all=y
KEYBOARD_ADC all=m
KEYBOARD_ADP5588 all=m
KEYBOARD_ADP5589 all=m
+KEYBOARD_APPLESPI all=m
KEYBOARD_ATKBD all=y sparc=m sparc64=m
KEYBOARD_QT1050 all=m
KEYBOARD_QT1070 all=m
@@ -3110,47 +3131,18 @@ TS4800_IRQ all=m
#- *** FILE: drivers/isdn/Kconfig ***
#-
ISDN all=y s390=n
-ISDN_I4L all=m
-#- file drivers/isdn/i4l/Kconfig goes here
-ISDN_CAPI all=m
#- file drivers/isdn/capi/Kconfig goes here
-#- file drivers/isdn/hardware/Kconfig goes here
-#- file drivers/isdn/gigaset/Kconfig goes here
-#- file drivers/isdn/hysdn/Kconfig goes here
#- file drivers/isdn/mISDN/Kconfig goes here
#-
#- *** FILE: drivers/isdn/capi/Kconfig ***
#-
+ISDN_CAPI all=m
CAPI_TRACE all=y
ISDN_CAPI_CAPI20 all=m
ISDN_CAPI_MIDDLEWARE all=y
-ISDN_CAPI_CAPIDRV all=m
ISDN_CAPI_CAPIDRV_VERBOSE all=y
-#-
-#- *** FILE: drivers/isdn/gigaset/Kconfig ***
-#-
-ISDN_DRV_GIGASET all=m
-GIGASET_CAPI all=y
-GIGASET_BASE all=m
-GIGASET_M105 all=m
-GIGASET_M101 all=m
-GIGASET_DEBUG all=n
-
-#-
-#- *** FILE: drivers/isdn/hardware/avm/Kconfig ***
-#-
-CAPI_AVM all=y
-ISDN_DRV_AVMB1_B1ISA alpha=m i386=m
-ISDN_DRV_AVMB1_B1PCI all=m sparc=n
-ISDN_DRV_AVMB1_B1PCIV4 all=y
-ISDN_DRV_AVMB1_T1ISA alpha=m i386=m
-ISDN_DRV_AVMB1_B1PCMCIA all=m
-ISDN_DRV_AVMB1_AVM_CS all=m
-ISDN_DRV_AVMB1_T1PCI all=m sparc=n
-ISDN_DRV_AVMB1_C4 all=m sparc=n
-
#-
#- *** FILE: drivers/isdn/hardware/mISDN/Kconfig ***
#-
@@ -3164,37 +3156,6 @@ MISDN_INFINEON all=m
MISDN_W6692 all=m
MISDN_NETJET all=m
-#-
-#- *** FILE: drivers/isdn/hisax/Kconfig ***
-#-
-ISDN_DRV_HISAX all=n
-#- D-channel protocol features
-#- HiSax supported cards
-#- HiSax PCMCIA card service modules
-#- HiSax sub driver modules
-
-#-
-#- *** FILE: drivers/isdn/hysdn/Kconfig ***
-#-
-HYSDN all=m
-HYSDN_CAPI all=y
-
-#-
-#- *** FILE: drivers/isdn/i4l/Kconfig ***
-#-
-ISDN_PPP all=y
-ISDN_PPP_VJ all=y
-ISDN_MPP all=y
-IPPP_FILTER all=y
-ISDN_PPP_BSDCOMP all=m
-ISDN_AUDIO all=y
-ISDN_TTY_FAX all=y
-ISDN_X25 all=y
-ISDN_DRV_LOOP all=m
-ISDN_DIVERSION all=m
-#- ISDN4Linux hardware drivers
-#- file drivers/isdn/hisax/Kconfig goes here
-
#-
#- *** FILE: drivers/isdn/mISDN/Kconfig ***
#-
@@ -3259,6 +3220,8 @@ LEDS_MLXCPLD all=m
LEDS_MLXREG all=m
LEDS_USER all=m
LEDS_NIC78BX all=m
+LEDS_TI_LMU_COMMON all=m
+LEDS_LM36274 all=m
#- LED Triggers
#- file drivers/leds/trigger/Kconfig goes here
@@ -3395,9 +3358,7 @@ MEDIA_RADIO_SUPPORT all=y
MEDIA_SDR_SUPPORT all=y
MEDIA_CEC_SUPPORT all=y
#- file drivers/media/cec/Kconfig goes here
-MEDIA_CONTROLLER all=y
-MEDIA_CONTROLLER_DVB all=y
-MEDIA_CONTROLLER_REQUEST_API all=y
+#- file drivers/media/mc/Kconfig goes here
VIDEO_DEV all=m
VIDEO_V4L2_SUBDEV_API all=y
#- file drivers/media/v4l2-core/Kconfig goes here
@@ -3604,6 +3565,13 @@ VIDEO_CX25840 all=m
#-
VIDEO_M5MOLS all=m
+#-
+#- *** FILE: drivers/media/mc/Kconfig ***
+#-
+MEDIA_CONTROLLER all=y
+MEDIA_CONTROLLER_DVB all=y
+MEDIA_CONTROLLER_REQUEST_API all=y
+
#-
#- *** FILE: drivers/media/mmc/siano/Kconfig ***
#-
@@ -4099,6 +4067,7 @@ DVB_USB_DIBUSB_MC all=m
DVB_USB_DIB0700 all=m
DVB_USB_UMT_010 all=m
DVB_USB_CXUSB all=m
+DVB_USB_CXUSB_ANALOG all=y
DVB_USB_M920X all=m
DVB_USB_DIGITV all=m
DVB_USB_VP7045 all=m
@@ -4316,6 +4285,7 @@ V4L2_FLASH_LED_CLASS all=m
#- *** FILE: drivers/memory/Kconfig ***
#-
MEMORY all=y
+DDR all=y
#- file drivers/memory/samsung/Kconfig goes here
#- file drivers/memory/tegra/Kconfig goes here
@@ -4371,9 +4341,11 @@ MFD_CROS_EC_CHARDEV all=m
MFD_MADERA all=m
MFD_MADERA_I2C all=m
MFD_MADERA_SPI all=m
+MFD_CS47L15 all=y
MFD_CS47L35 all=y
MFD_CS47L85 all=y
MFD_CS47L90 all=y
+MFD_CS47L92 all=y
PMIC_DA903X powerpc=y
MFD_DA9052_SPI all=y
MFD_DA9062 all=m
@@ -4488,10 +4460,10 @@ HMC6352 all=m
DS1682 all=m
VMWARE_BALLOON all=m
PCH_PHUB all=m
-USB_SWITCH_FSA9480 all=m
LATTICE_ECP3_CONFIG all=m
SRAM all=n
PCI_ENDPOINT_TEST all=m
+XILINX_SDFEC all=m
PVPANIC all=m
#- file drivers/misc/c2port/Kconfig goes here
#- file drivers/misc/eeprom/Kconfig goes here
@@ -4687,6 +4659,7 @@ MTD_PARTITIONED_MASTER all=y
#- file drivers/mtd/lpddr/Kconfig goes here
#- file drivers/mtd/spi-nor/Kconfig goes here
#- file drivers/mtd/ubi/Kconfig goes here
+#- file drivers/mtd/hyperbus/Kconfig goes here
#-
#- *** FILE: drivers/mtd/chips/Kconfig ***
@@ -4739,6 +4712,11 @@ MTD_BLOCK2MTD all=m
#- Disk-On-Chip Device Drivers
MTD_DOCG3 all=m
+#-
+#- *** FILE: drivers/mtd/hyperbus/Kconfig ***
+#-
+MTD_HYPERBUS all=m
+
#-
#- *** FILE: drivers/mtd/lpddr/Kconfig ***
#-
@@ -5078,6 +5056,7 @@ NET_DSA_MV88E6XXX_PTP all=y
#- *** FILE: drivers/net/dsa/sja1105/Kconfig ***
#-
NET_DSA_SJA1105 all=m
+NET_DSA_SJA1105_PTP all=y
#-
#- *** FILE: drivers/net/ethernet/3com/Kconfig ***
@@ -5139,6 +5118,7 @@ DNET all=m
#- file drivers/net/ethernet/faraday/Kconfig goes here
#- file drivers/net/ethernet/freescale/Kconfig goes here
#- file drivers/net/ethernet/fujitsu/Kconfig goes here
+#- file drivers/net/ethernet/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
@@ -5439,6 +5419,12 @@ GIANFAR ppc=m
NET_VENDOR_FUJITSU all=y
PCMCIA_FMVJ18X all=m
+#-
+#- *** FILE: drivers/net/ethernet/google/Kconfig ***
+#-
+NET_VENDOR_GOOGLE all=y
+GVE all=m
+
#-
#- *** FILE: drivers/net/ethernet/hp/Kconfig ***
#-
@@ -5528,7 +5514,10 @@ MLX5_MPFS all=y
MLX5_ESWITCH all=y
MLX5_CORE_EN_DCB all=y
MLX5_CORE_IPOIB all=y
+MLX5_FPGA_IPSEC all=y
MLX5_EN_IPSEC all=y
+MLX5_FPGA_TLS all=y
+MLX5_TLS all=y
MLX5_EN_TLS all=y
#-
@@ -5765,6 +5754,7 @@ NET_VENDOR_STMICRO all=y
#- *** FILE: drivers/net/ethernet/stmicro/stmmac/Kconfig ***
#-
STMMAC_ETH all=m
+STMMAC_SELFTESTS all=n
STMMAC_PLATFORM all=n
STMMAC_PCI all=n
@@ -5831,6 +5821,7 @@ WIZNET_W5100_SPI all=m
#-
NET_VENDOR_XILINX all=y
XILINX_EMACLITE powerpc=m
+XILINX_AXI_EMAC all=m
XILINX_LL_TEMAC all=m
#-
@@ -5932,6 +5923,7 @@ MICROCHIP_PHY all=m
MICROCHIP_T1_PHY all=m
MICROSEMI_PHY all=m
NATIONAL_PHY all=m
+NXP_TJA11XX_PHY all=m
QSEMI_PHY all=m
REALTEK_PHY all=m
RENESAS_PHY all=m
@@ -6234,12 +6226,17 @@ B43LEGACY_PIO_MODE all=n
#-
BRCMUTIL all=m
BRCMSMAC all=m
+#- file drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig goes here
+BRCM_TRACING all=y
+BRCMDBG all=n
+
+#-
+#- *** FILE: drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig ***
+#-
BRCMFMAC all=m
BRCMFMAC_SDIO all=y
BRCMFMAC_USB all=y
BRCMFMAC_PCIE all=y
-BRCM_TRACING all=y
-BRCMDBG all=n
#-
#- *** FILE: drivers/net/wireless/cisco/Kconfig ***
@@ -6642,6 +6639,7 @@ NFC_ST95HF all=m
#- *** FILE: drivers/ntb/Kconfig ***
#-
NTB all=m
+NTB_MSI all=y
#- file drivers/ntb/hw/Kconfig goes here
#- file drivers/ntb/test/Kconfig goes here
NTB_TRANSPORT all=m
@@ -6672,6 +6670,7 @@ NTB_SWITCHTEC all=m
NTB_PINGPONG all=m
NTB_TOOL all=m
NTB_PERF all=m
+NTB_MSI_TEST all=m
#-
#- *** FILE: drivers/nvdimm/Kconfig ***
@@ -6952,9 +6951,9 @@ CHROMEOS_LAPTOP all=m
CHROMEOS_PSTORE all=m
CHROMEOS_TBMC all=m
CROS_EC_I2C all=m
+CROS_EC_ISHTP all=m
CROS_EC_SPI all=m
CROS_EC_LPC all=m
-CROS_EC_LPC_MEC all=y
CROS_KBD_LED_BACKLIGHT all=m
CROS_EC_LIGHTBAR all=m
CROS_EC_DEBUGFS all=m
@@ -6967,6 +6966,8 @@ CROS_USBPD_LOGGER all=m
#-
WILCO_EC all=m
WILCO_EC_DEBUGFS all=m
+WILCO_EC_EVENTS all=m
+WILCO_EC_TELEMETRY all=m
#-
#- *** FILE: drivers/platform/goldfish/Kconfig ***
@@ -7034,6 +7035,7 @@ ASUS_WIRELESS all=m
ACPI_WMI all=m
WMI_BMOF all=m
INTEL_WMI_THUNDERBOLT all=m
+XIAOMI_WMI all=m
MSI_WMI all=m
PEAQ_WMI all=m
TOPSTAR_LAPTOP all=m
@@ -7071,6 +7073,12 @@ I2C_MULTI_INSTANTIATE all=m
INTEL_ATOMISP2_PM all=m
HUAWEI_WMI all=m
PCENGINES_APU2 all=m
+#- file drivers/platform/x86/intel_speed_select_if/Kconfig goes here
+
+#-
+#- *** FILE: drivers/platform/x86/intel_speed_select_if/Kconfig ***
+#-
+INTEL_SPEED_SELECT_INTERFACE all=m
#-
#- *** FILE: drivers/pnp/Kconfig ***
@@ -7169,6 +7177,7 @@ BATTERY_GOLDFISH all=m
BATTERY_RT5033 all=m
CHARGER_RT9455 all=m
CHARGER_CROS_USBPD all=m
+CHARGER_WILCO all=m
#-
#- *** FILE: drivers/powercap/Kconfig ***
@@ -7301,6 +7310,7 @@ REGULATOR_QCOM_SPMI all=m
REGULATOR_RN5T618 all=m
REGULATOR_RT5033 all=m
REGULATOR_SKY81452 all=m
+REGULATOR_SLG51000 all=m
REGULATOR_TPS51632 all=m
REGULATOR_TPS6105X all=m
REGULATOR_TPS62360 all=m
@@ -7379,6 +7389,7 @@ RTC_DRV_PCF8563 all=m
RTC_DRV_PCF8583 all=m sparc=n
RTC_DRV_M41T80 all=m
RTC_DRV_M41T80_WDT all=n ia64=y
+RTC_DRV_BD70528 all=m
RTC_DRV_BQ32K all=m
RTC_DRV_TWL4030 all=m
RTC_DRV_S35390A all=m
@@ -7477,7 +7488,6 @@ SCSI_PROC_FS all=y
#- SCSI support type (disk, tape, CD-ROM)
BLK_DEV_SD all=m
CHR_DEV_ST all=m
-CHR_DEV_OSST all=m
BLK_DEV_SR all=m
BLK_DEV_SR_VENDOR all=y
CHR_DEV_SG all=m
@@ -7537,6 +7547,7 @@ FCOE_FNIC all=m
SCSI_SNIC all=m
SCSI_SNIC_DEBUG_FS all=y
SCSI_DMX3191D all=m
+SCSI_FDOMAIN_PCI all=m
SCSI_GDTH all=m
SCSI_ISCI all=m
SCSI_GENERIC_NCR5380 alpha=m i386=m
@@ -7697,6 +7708,7 @@ SCSI_MVSAS_TASKLET all=y
#-
SCSI_LOWLEVEL_PCMCIA all=y ia64=n
PCMCIA_AHA152X i386=m ppc=n x86_64=m
+PCMCIA_FDOMAIN all=m
PCMCIA_NINJA_SCSI i386=m ppc=n x86_64=m
PCMCIA_QLOGIC all=m
PCMCIA_SYM53C500 all=m
@@ -7895,6 +7907,7 @@ STAGING all=y
#- file drivers/staging/erofs/Kconfig goes here
#- file drivers/staging/fieldbus/Kconfig goes here
#- file drivers/staging/kpc2000/Kconfig goes here
+#- file drivers/staging/isdn/Kconfig goes here
#-
#- *** FILE: drivers/staging/axis-fifo/Kconfig ***
@@ -8193,6 +8206,35 @@ ADE7854_SPI all=m
#-
AD2S1210 all=m
+#-
+#- *** FILE: drivers/staging/isdn/avm/Kconfig ***
+#-
+CAPI_AVM all=y
+ISDN_DRV_AVMB1_B1ISA alpha=m i386=m
+ISDN_DRV_AVMB1_B1PCI all=m sparc=n
+ISDN_DRV_AVMB1_B1PCIV4 all=y
+ISDN_DRV_AVMB1_T1ISA alpha=m i386=m
+ISDN_DRV_AVMB1_B1PCMCIA all=m
+ISDN_DRV_AVMB1_AVM_CS all=m
+ISDN_DRV_AVMB1_T1PCI all=m sparc=n
+ISDN_DRV_AVMB1_C4 all=m sparc=n
+
+#-
+#- *** FILE: drivers/staging/isdn/gigaset/Kconfig ***
+#-
+ISDN_DRV_GIGASET all=m
+GIGASET_CAPI all=y
+GIGASET_BASE all=m
+GIGASET_M105 all=m
+GIGASET_M101 all=m
+GIGASET_DEBUG all=n
+
+#-
+#- *** FILE: drivers/staging/isdn/hysdn/Kconfig ***
+#-
+HYSDN all=m
+HYSDN_CAPI all=y
+
#-
#- *** FILE: drivers/staging/kpc2000/Kconfig ***
#-
@@ -8207,11 +8249,13 @@ KS7010 all=m
#- *** FILE: drivers/staging/media/Kconfig ***
#-
STAGING_MEDIA all=y
+#- file drivers/staging/media/allegro-dvt/Kconfig goes here
#- file drivers/staging/media/bcm2048/Kconfig goes here
#- file drivers/staging/media/davinci_vpfe/Kconfig goes here
+#- file drivers/staging/media/hantro/Kconfig goes here
#- file drivers/staging/media/imx/Kconfig goes here
+#- file drivers/staging/media/meson/vdec/Kconfig goes here
#- file drivers/staging/media/omap4iss/Kconfig goes here
-#- file drivers/staging/media/rockchip/vpu/Kconfig goes here
#- file drivers/staging/media/sunxi/Kconfig goes here
#- file drivers/staging/media/tegra-vde/Kconfig goes here
#- file drivers/staging/media/ipu3/Kconfig goes here
@@ -9379,6 +9423,7 @@ VIRTIO all=m
VIRTIO_MENU all=y
VIRTIO_PCI all=m
VIRTIO_PCI_LEGACY all=y
+VIRTIO_PMEM all=m
VIRTIO_BALLOON all=m
VIRTIO_INPUT all=m
VIRTIO_MMIO all=m
@@ -9457,6 +9502,7 @@ WATCHDOG all=y
WATCHDOG_CORE all=y
WATCHDOG_NOWAYOUT all=n
WATCHDOG_HANDLE_BOOT_ENABLED all=y
+WATCHDOG_OPEN_TIMEOUT all=0
WATCHDOG_SYSFS all=y
#- Watchdog Pretimeout Governors
WATCHDOG_PRETIMEOUT_GOV all=y
@@ -9549,7 +9595,6 @@ USBPCWATCHDOG all=m
#- *** FILE: drivers/xen/Kconfig ***
#-
XEN_BALLOON all=y
-XEN_SELFBALLOONING all=y
XEN_BALLOON_MEMORY_HOTPLUG all=y
XEN_BALLOON_MEMORY_HOTPLUG_LIMIT x86_64=512 x86=4
XEN_SCRUB_PAGES_DEFAULT all=y
@@ -9738,6 +9783,7 @@ CACHEFILES_HISTOGRAM all=n
CEPH_FS all=m
CEPH_FSCACHE all=y
CEPH_FS_POSIX_ACL all=y
+CEPH_FS_SECURITY_LABEL all=y
#-
#- *** FILE: fs/cifs/Kconfig ***
@@ -9749,7 +9795,6 @@ CIFS_WEAK_PW_HASH all=y
CIFS_UPCALL all=y
CIFS_XATTR all=y
CIFS_POSIX all=y
-CIFS_ACL all=y
CIFS_DEBUG all=y
CIFS_DEBUG2 all=n
CIFS_DEBUG_DUMP_KEYS all=n
@@ -10174,6 +10219,7 @@ UBIFS_FS all=m
UBIFS_FS_ADVANCED_COMPR all=y
UBIFS_FS_LZO all=y
UBIFS_FS_ZLIB all=y
+UBIFS_FS_ZSTD all=y
UBIFS_ATIME_SUPPORT all=y
UBIFS_FS_XATTR all=y
UBIFS_FS_SECURITY all=y
@@ -10215,6 +10261,9 @@ 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=""
HAVE_KERNEL_GZIP all=y
@@ -10257,6 +10306,8 @@ IKHEADERS all=m
LOG_BUF_SHIFT all=18
LOG_CPU_MAX_BUF_SHIFT all=12
PRINTK_SAFE_LOG_BUF_SHIFT all=13
+UCLAMP_TASK all=y
+UCLAMP_BUCKETS_COUNT all=5
NUMA_BALANCING all=y
NUMA_BALANCING_DEFAULT_ENABLED all=y
CGROUPS all=y
@@ -10265,7 +10316,6 @@ MEMCG all=y
MEMCG_SWAP all=y
MEMCG_SWAP_ENABLED all=y
BLK_CGROUP all=y
-DEBUG_BLK_CGROUP all=n
CGROUP_SCHED all=y
FAIR_GROUP_SCHED all=y
CFS_BANDWIDTH all=y
@@ -10529,7 +10579,7 @@ HAS_IOMEM all=y
CHECK_SIGNATURE all=y
CPU_RMAP all=y
GLOB_SELFTEST all=n
-DDR all=y
+#- file lib/vdso/Kconfig goes here
#- file lib/fonts/Kconfig goes here
STRING_SELFTEST all=n
@@ -10556,6 +10606,7 @@ READABLE_ASM all=n
UNUSED_SYMBOLS all=y
#* 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
@@ -10636,6 +10687,7 @@ TEST_SORT all=n
KPROBES_SANITY_TEST all=n
BACKTRACE_SELF_TEST all=m
RBTREE_TEST all=m
+REED_SOLOMON_TEST all=m
INTERVAL_TREE_TEST all=m
PERCPU_TEST all=m
ATOMIC64_SELFTEST all=n
@@ -10658,6 +10710,7 @@ TEST_LKM all=m
TEST_VMALLOC all=m
TEST_USER_COPY all=n
TEST_BPF all=n
+TEST_BLACKHOLE_DEV all=m
FIND_BIT_BENCHMARK all=m
TEST_FIRMWARE all=m
TEST_SYSCTL all=m
@@ -10667,6 +10720,7 @@ TEST_KMOD all=m
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
@@ -10768,7 +10822,6 @@ IDLE_PAGE_TRACKING all=y
ZONE_DEVICE all=y
HMM_MIRROR all=n
DEVICE_PRIVATE all=y
-DEVICE_PUBLIC all=y
PERCPU_STATS all=n
GUP_BENCHMARK all=n
@@ -10999,8 +11052,10 @@ BRIDGE_VLAN_FILTERING all=y
#- *** FILE: net/bridge/netfilter/Kconfig ***
#-
NF_TABLES_BRIDGE all=y
+NFT_BRIDGE_META all=m
NFT_BRIDGE_REJECT all=m
NF_LOG_BRIDGE all=m
+NF_CONNTRACK_BRIDGE all=m
BRIDGE_NF_EBTABLES all=m
BRIDGE_EBT_BROUTE all=m
BRIDGE_EBT_T_FILTER all=m
@@ -11401,6 +11456,7 @@ NFT_XFRM all=m
NFT_SOCKET all=m
NFT_OSF all=m
NFT_TPROXY all=m
+NFT_SYNPROXY all=m
NF_DUP_NETDEV all=m
NFT_DUP_NETDEV all=m
NFT_FWD_NETDEV all=m
@@ -11707,16 +11763,18 @@ NET_ACT_PEDIT all=m
NET_ACT_SIMP all=m
NET_ACT_SKBEDIT all=m
NET_ACT_CSUM all=m
+NET_ACT_MPLS all=m
NET_ACT_VLAN all=m
NET_ACT_BPF all=m
NET_ACT_CONNMARK all=m
+NET_ACT_CTINFO all=m
NET_ACT_SKBMOD all=m
NET_ACT_IFE all=m
NET_ACT_TUNNEL_KEY all=m
+NET_ACT_CT all=m
NET_IFE_SKBMARK all=m
NET_IFE_SKBPRIO all=m
NET_IFE_SKBTCINDEX all=m
-NET_CLS_IND all=y
NET_SCH_FIFO all=y
#-
@@ -11880,6 +11938,8 @@ GCC_PLUGIN_STACKLEAK all=y
STACKLEAK_TRACK_MIN_SIZE all=100
STACKLEAK_METRICS all=y
STACKLEAK_RUNTIME_DISABLE all=y
+INIT_ON_ALLOC_DEFAULT_ON all=n
+INIT_ON_FREE_DEFAULT_ON all=n
#-
#- *** FILE: security/apparmor/Kconfig ***
@@ -11921,6 +11981,7 @@ IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY all=n
#- *** FILE: security/keys/Kconfig ***
#-
KEYS all=y
+KEYS_REQUEST_CACHE all=y
PERSISTENT_KEYRINGS all=y
BIG_KEYS all=y
TRUSTED_KEYS all=m
@@ -12534,6 +12595,8 @@ SND_SST_ATOM_HIFI2_PLATFORM all=m
SND_SST_ATOM_HIFI2_PLATFORM_PCI all=m
SND_SST_ATOM_HIFI2_PLATFORM_ACPI all=m
SND_SOC_INTEL_SKYLAKE all=m
+SND_SOC_INTEL_CML_H all=m
+SND_SOC_INTEL_CML_LP all=m
SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC all=y
#- file sound/soc/intel/boards/Kconfig goes here
@@ -12551,6 +12614,7 @@ SND_SOC_INTEL_CHT_BSW_RT5672_MACH all=m
SND_SOC_INTEL_CHT_BSW_RT5645_MACH all=m
SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH all=m
SND_SOC_INTEL_CHT_BSW_NAU8824_MACH all=m
+SND_SOC_INTEL_BYT_CHT_CX2072X_MACH all=m
SND_SOC_INTEL_BYT_CHT_DA7213_MACH all=m
SND_SOC_INTEL_BYT_CHT_ES8316_MACH all=m
SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH all=m
@@ -12602,6 +12666,8 @@ SND_SOC_SOF_GEMINILAKE_SUPPORT all=y
SND_SOC_SOF_CANNONLAKE_SUPPORT all=y
SND_SOC_SOF_COFFEELAKE_SUPPORT all=y
SND_SOC_SOF_ICELAKE_SUPPORT all=y
+SND_SOC_SOF_COMETLAKE_LP_SUPPORT all=y
+SND_SOC_SOF_COMETLAKE_H_SUPPORT all=y
SND_SOC_SOF_HDA_LINK all=y
SND_SOC_SOF_HDA_AUDIO_CODEC all=y
@@ -12701,18 +12767,28 @@ CFQ_GROUP_IOSCHED all=y
CHARGER_LTC3651 all=m
CHASH_SELFTEST all=n
CHASH_STATS all=n
+CHR_DEV_OSST all=m
+CIFS_ACL all=y
+CROS_EC_LPC_MEC all=y
+DEBUG_BLK_CGROUP all=n
DEBUG_PI_LIST all=n
DEFAULT_CFQ all=y
DEFAULT_DEADLINE all=n
DEFAULT_IOSCHED all="cfq"
DEFAULT_NOOP all=n
DEFAULT_SECURITY all=""
+DEVICE_PUBLIC all=y
EARLY_PRINTK_EFI all=n
EXOFS_DEBUG all=n
EXOFS_FS all=m
EXT4_ENCRYPTION all=y
F2FS_FS_ENCRYPTION all=y
FB_XGI all=m
+FMC all=m
+FMC_CHARDEV all=m
+FMC_FAKEDEV all=m
+FMC_TRIVIAL all=m
+FMC_WRITE_EEPROM all=m
INET6_XFRM_MODE_BEET all=m
INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m
INET6_XFRM_MODE_TRANSPORT all=m
@@ -12720,16 +12796,31 @@ 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_NES all=m sparc=
+INFINIBAND_NES_DEBUG all=n
INTEL_RDT all=y
IOSCHED_CFQ all=y
IOSCHED_DEADLINE all=y
IOSCHED_NOOP all=y
+IPPP_FILTER all=y
+ISDN_AUDIO all=y
+ISDN_CAPI_CAPIDRV all=m
ISDN_DIVAS all=m sparc=n
ISDN_DIVAS_BRIPCI all=y
ISDN_DIVAS_DIVACAPI all=m
ISDN_DIVAS_MAINT all=m
ISDN_DIVAS_PRIPCI all=y
ISDN_DIVAS_USERIDI all=m
+ISDN_DIVERSION all=m
+ISDN_DRV_HISAX all=n
+ISDN_DRV_LOOP all=m
+ISDN_I4L all=m
+ISDN_MPP all=y
+ISDN_PPP all=y
+ISDN_PPP_BSDCOMP all=m
+ISDN_PPP_VJ all=y
+ISDN_TTY_FAX all=y
+ISDN_X25 all=y
LBDAF i386=y ppc=y sparc=y sparc64=
LCD_OTM3225A all=m
MAY_USE_DEVLINK all=m
@@ -12747,6 +12838,7 @@ MTD_SPINAND_ONDIEECC all=y
MTK_AEE_KDUMP all=y
MTK_MMC all=m
MTK_MMC_CD_POLL all=y
+NET_CLS_IND all=y
NET_DSA_LEGACY all=y
NFT_CHAIN_NAT_IPV4 all=m
NFT_CHAIN_NAT_IPV6 all=m
@@ -12778,6 +12870,7 @@ SOC_CAMERA_TW9910 all=m
TI_CPSW_ALE all=m
TRACING_EVENTS_GPIO all=y
UBIFS_FS_ENCRYPTION all=y
+USB_SWITCH_FSA9480 all=m
VIDEO_SH_MOBILE_CEU all=m
VIDEO_ZORAN all=m ppc=n sparc=n
VIDEO_ZORAN_AVS6EYES all=m
@@ -12787,3 +12880,4 @@ VIDEO_ZORAN_DC30 all=m
VIDEO_ZORAN_LML33 all=m
VIDEO_ZORAN_LML33R10 all=m
VIDEO_ZORAN_ZR36060 all=m
+XEN_SELFBALLOONING all=y
diff --git a/kernel-pom-ng-IPV4OPTSSTRIP.patch b/kernel-pom-ng-IPV4OPTSSTRIP.patch
index cb970ec2..8379226a 100644
--- a/kernel-pom-ng-IPV4OPTSSTRIP.patch
+++ b/kernel-pom-ng-IPV4OPTSSTRIP.patch
@@ -57,7 +57,7 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu
+ unsigned char *optiph;
+ int l;
+
-+ if (!skb_make_writable(skb, skb->len))
++ if (skb_ensure_writable(skb, skb->len))
+ return NF_DROP;
+
+ iph = ip_hdr(skb);
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index ab67422d..6467050d 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -1,172 +1,2 @@
---- linux-5.1/net/sunrpc/Kconfig~ 2019-05-06 02:42:58.000000000 +0200
-+++ linux-5.1/net/sunrpc/Kconfig 2019-05-10 12:54:36.566903892 +0200
-@@ -34,7 +34,7 @@ config RPCSEC_GSS_KRB5
-
- If unsure, say Y.
-
--config CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES
-+config SUNRPC_DISABLE_INSECURE_ENCTYPES
- bool "Secure RPC: Disable insecure Kerberos encryption types"
- depends on RPCSEC_GSS_KRB5
- default n
-Move setting up operation and write hint to xfs_alloc_ioend, and
-then just copy over all needed information from the previous bio
-in xfs_chain_bio and stop passing various parameters to it.
-
-Signed-off-by: Christoph Hellwig <hch at lst.de>
----
- fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------
- 1 file changed, 17 insertions(+), 18 deletions(-)
-
-diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
-index a6f0f4761a37..9cceb90e77c5 100644
---- a/fs/xfs/xfs_aops.c
-+++ b/fs/xfs/xfs_aops.c
-@@ -665,7 +665,6 @@ xfs_submit_ioend(
-
- ioend->io_bio->bi_private = ioend;
- ioend->io_bio->bi_end_io = xfs_end_bio;
-- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
-
- /*
- * If we are failing the IO now, just mark the ioend with an
-@@ -679,7 +678,6 @@ xfs_submit_ioend(
- return status;
- }
-
-- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
- submit_bio(ioend->io_bio);
- return 0;
- }
-@@ -691,7 +689,8 @@ xfs_alloc_ioend(
- xfs_exntst_t state,
- xfs_off_t offset,
- struct block_device *bdev,
-- sector_t sector)
-+ sector_t sector,
-+ struct writeback_control *wbc)
- {
- struct xfs_ioend *ioend;
- struct bio *bio;
-@@ -699,6 +698,8 @@ xfs_alloc_ioend(
- bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset);
- bio_set_dev(bio, bdev);
- bio->bi_iter.bi_sector = sector;
-+ bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
-+ bio->bi_write_hint = inode->i_write_hint;
-
- ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
- INIT_LIST_HEAD(&ioend->io_list);
-@@ -719,24 +720,22 @@ xfs_alloc_ioend(
- * so that the bi_private linkage is set up in the right direction for the
- * traversal in xfs_destroy_ioend().
- */
--static void
-+static struct bio *
- xfs_chain_bio(
-- struct xfs_ioend *ioend,
-- struct writeback_control *wbc,
-- struct block_device *bdev,
-- sector_t sector)
-+ struct bio *prev)
- {
- struct bio *new;
-
- new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
-- bio_set_dev(new, bdev);
-- new->bi_iter.bi_sector = sector;
-- bio_chain(ioend->io_bio, new);
-- bio_get(ioend->io_bio); /* for xfs_destroy_ioend */
-- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
-- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
-- submit_bio(ioend->io_bio);
-- ioend->io_bio = new;
-+ bio_copy_dev(new, prev);
-+ new->bi_iter.bi_sector = bio_end_sector(prev);
-+ new->bi_opf = prev->bi_opf;
-+ new->bi_write_hint = prev->bi_write_hint;
-+
-+ bio_chain(prev, new);
-+ bio_get(prev); /* for xfs_destroy_ioend */
-+ submit_bio(prev);
-+ return new;
- }
-
- /*
-@@ -772,7 +772,7 @@ xfs_add_to_ioend(
- if (wpc->ioend)
- list_add(&wpc->ioend->io_list, iolist);
- wpc->ioend = xfs_alloc_ioend(inode, wpc->fork,
-- wpc->imap.br_state, offset, bdev, sector);
-+ wpc->imap.br_state, offset, bdev, sector, wbc);
- }
-
- merged = __bio_try_merge_page(wpc->ioend->io_bio, page, len, poff,
-@@ -783,7 +783,7 @@ xfs_add_to_ioend(
-
- if (!merged) {
- if (bio_full(wpc->ioend->io_bio, len))
-- xfs_chain_bio(wpc->ioend, wbc, bdev, sector);
-+ wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio);
- bio_add_page(wpc->ioend->io_bio, page, len, poff);
- }
-
---
-2.20.1
-
-
-Link every newly allocated writeback bio to cgroup pointed to by the
-writeback control structure, and charge every byte written back to it.
-
-Tested-by: Stefan Priebe - Profihost AG <s.priebe at profihost.ag>
-Signed-off-by: Christoph Hellwig <hch at lst.de>
----
- fs/xfs/xfs_aops.c | 4 +++-
- fs/xfs/xfs_super.c | 2 ++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
-index 9cceb90e77c5..73c291aeae17 100644
---- a/fs/xfs/xfs_aops.c
-+++ b/fs/xfs/xfs_aops.c
-@@ -700,6 +700,7 @@ xfs_alloc_ioend(
- bio->bi_iter.bi_sector = sector;
- bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
- bio->bi_write_hint = inode->i_write_hint;
-+ wbc_init_bio(wbc, bio);
-
- ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
- INIT_LIST_HEAD(&ioend->io_list);
-@@ -727,7 +728,7 @@ xfs_chain_bio(
- struct bio *new;
-
- new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
-- bio_copy_dev(new, prev);
-+ bio_copy_dev(new, prev);/* also copies over blkcg information */
- new->bi_iter.bi_sector = bio_end_sector(prev);
- new->bi_opf = prev->bi_opf;
- new->bi_write_hint = prev->bi_write_hint;
-@@ -782,6 +783,7 @@ xfs_add_to_ioend(
- }
-
- wpc->ioend->io_size += len;
-+ wbc_account_io(wbc, page, len);
- }
-
- STATIC void
-diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
-index 594c119824cc..ee0df8f611ff 100644
---- a/fs/xfs/xfs_super.c
-+++ b/fs/xfs/xfs_super.c
-@@ -1685,6 +1685,8 @@ xfs_fs_fill_super(
- sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits);
- sb->s_max_links = XFS_MAXLINK;
- sb->s_time_gran = 1;
-+ sb->s_iflags |= SB_I_CGROUPWB;
-+
- set_posix_acl_flag(sb);
-
- /* version 5 superblocks support inode version counters. */
---
-2.20.1
-
+;
+;
diff --git a/kernel-x86.config b/kernel-x86.config
index fe2070fc..905d82bd 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -100,7 +100,8 @@ HOTPLUG_CPU x86=y
BOOTPARAM_HOTPLUG_CPU0 all=n
DEBUG_HOTPLUG_CPU0 all=n
COMPAT_VDSO x86=n
-LEGACY_VSYSCALL_EMULATE all=y
+LEGACY_VSYSCALL_EMULATE all=n
+LEGACY_VSYSCALL_XONLY all=y
LEGACY_VSYSCALL_NONE all=n
CMDLINE_BOOL x86=n
#- file kernel/livepatch/Kconfig goes here
diff --git a/xfs-reclaim-hack.patch b/xfs-reclaim-hack.patch
index 05198cb1..a76a7911 100644
--- a/xfs-reclaim-hack.patch
+++ b/xfs-reclaim-hack.patch
@@ -22,10 +22,10 @@ See: https://marc.info/?t=154345187200003
kernel/sysctl_binary.c | 1 +
9 files changed, 34 insertions(+), 1 deletion(-)
-diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt
+diff --git a/Documentation/admin-guide/xfs.rst b/Documentation/admin-guide/xfs.rst
index 3b9b5c149f322..b33a4822f879c 100644
---- a/Documentation/filesystems/xfs.txt
-+++ b/Documentation/filesystems/xfs.txt
+--- a/Documentation/admin-guide/xfs.rst
++++ b/Documentation/admin-guide/xfs.rst
@@ -331,6 +331,12 @@ The following sysctls are available for the XFS filesystem:
is to control the rate at which the allocator moves between
allocation groups when allocating extents for new files.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/eca34b5cb0c32e09e185c20cc5cecb73d9475975
More information about the pld-cvs-commit
mailing list