Commit e263b323 authored by J. R. Okajima's avatar J. R. Okajima
Browse files

5.x-rcN 20210503


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent baec685a
......@@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
index c80ad735b3840..aec1e2f2dffe0 100644
index 9450e052f1b13..f7db6edba5a37 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2983,6 +2983,19 @@ F: include/linux/audit.h
@@ -2992,6 +2992,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h
F: kernel/audit*
......@@ -245,7 +245,7 @@ index a55179fd60fc3..8e21c53cf8831 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index c6d0c1dc62532..0f557138af3e9 100644
index f160f1c97ca1e..fe71c2737eb9e 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -188,7 +188,7 @@ static
......
......@@ -151,10 +151,10 @@ index 72227b24a6168..5d03943b08e03 100644
# Give 'page_alloc' its own module-parameter namespace
page-alloc-y := page_alloc.o
diff --git a/mm/filemap.c b/mm/filemap.c
index 43700480d897d..be29fc5b9d04b 100644
index 6ce832dc59e73..8b7a71b6f0e6c 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3155,7 +3155,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -3162,7 +3162,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(mapping->host->i_sb);
......
......@@ -194,7 +194,7 @@ index b3444e06cded4..7b0f851b63d75 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 0f557138af3e9..ac177ade7d9bd 100644
index fe71c2737eb9e..185531f89239a 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -209,6 +209,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
......
......@@ -40,7 +40,7 @@
#include <limits.h>
#endif /* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN-20210412"
#define AUFS_VERSION "5.x-rcN-20210503"
/* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
......@@ -6,7 +6,7 @@ index 20c46305e057e..17362f35d3845 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index ac177ade7d9bd..d5dacc66ec2ec 100644
index 185531f89239a..7432e0c97366e 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment