Skip to content

GitLab

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

5.x-rcN 20210412 


Signed-off-by: default avatarJ. R. Okajima <hooanon05g@gmail.com>
parent 7ac7b5db
Show whitespace changes
Inline Side-by-side
aufs5-base.patch
View file @ 21530afc
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN base patch aufs5.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index d92f85ca831d3..339cc62f77736 100644 index c80ad735b3840..aec1e2f2dffe0 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2983,6 +2983,19 @@ F: include/linux/audit.h @@ -2983,6 +2983,19 @@ F: include/linux/audit.h
......
aufs5-kbuild.patch
View file @ 21530afc
...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0 ...@@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-2.0
aufs5.x-rcN kbuild patch aufs5.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig diff --git a/fs/Kconfig b/fs/Kconfig
index 462253ae483a3..f1b652830e2be 100644 index a55bda4233bbe..c4984b5bf340f 100644
--- a/fs/Kconfig --- a/fs/Kconfig
+++ b/fs/Kconfig +++ b/fs/Kconfig
@@ -288,6 +288,7 @@ source "fs/sysv/Kconfig" @@ -288,6 +288,7 @@ source "fs/sysv/Kconfig"
......
aufs5-loopback.patch
View file @ 21530afc
...@@ -153,7 +153,7 @@ index a3c04f310672e..161c3c5d1c22b 100644 ...@@ -153,7 +153,7 @@ index a3c04f310672e..161c3c5d1c22b 100644
void *key_data; void *key_data;
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
index 5ef279a59bb14..6447c37f98756 100644 index 9f58ba0cb769f..1c2267a5a2ae1 100644
--- a/fs/aufs/f_op.c --- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c +++ b/fs/aufs/f_op.c
@@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter) @@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
......
aufs5-mmap.patch
View file @ 21530afc
...@@ -31,7 +31,7 @@ index 13452b32e2bd5..38acccfef9d49 100644 ...@@ -31,7 +31,7 @@ index 13452b32e2bd5..38acccfef9d49 100644
ino = inode->i_ino; ino = inode->i_ino;
} }
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 3cec6fbef725e..d83d155870312 100644 index e862cab695838..5c45041943a6f 100644
--- a/fs/proc/task_mmu.c --- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c
@@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) @@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
...@@ -46,7 +46,7 @@ index 3cec6fbef725e..d83d155870312 100644 ...@@ -46,7 +46,7 @@ index 3cec6fbef725e..d83d155870312 100644
dev = inode->i_sb->s_dev; dev = inode->i_sb->s_dev;
ino = inode->i_ino; ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1863,7 +1866,7 @@ static int show_numa_map(struct seq_file *m, void *v) @@ -1861,7 +1864,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps; struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v; struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md; struct numa_maps *md = &numa_priv->md;
...@@ -72,10 +72,10 @@ index a6d21fc0033c6..02c2de31196e0 100644 ...@@ -72,10 +72,10 @@ index a6d21fc0033c6..02c2de31196e0 100644
ino = inode->i_ino; ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h diff --git a/include/linux/mm.h b/include/linux/mm.h
index 77e64e3eac80b..5e9ae04137eac 100644 index 8ba434287387b..6d23d40ad1523 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1726,6 +1726,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -1759,6 +1759,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0); unmap_mapping_range(mapping, holebegin, holelen, 0);
} }
...@@ -105,10 +105,10 @@ index 77e64e3eac80b..5e9ae04137eac 100644 ...@@ -105,10 +105,10 @@ index 77e64e3eac80b..5e9ae04137eac 100644
void *buf, int len, unsigned int gup_flags); void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, 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 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 0974ad501a47c..d7c95c625cdbc 100644 index 6613b26a88946..e94df45b5483a 100644
--- a/include/linux/mm_types.h --- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h +++ b/include/linux/mm_types.h
@@ -278,6 +278,7 @@ struct vm_region { @@ -279,6 +279,7 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */ unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */ unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */ struct file *vm_file; /* the backing file or NULL */
...@@ -116,7 +116,7 @@ index 0974ad501a47c..d7c95c625cdbc 100644 ...@@ -116,7 +116,7 @@ index 0974ad501a47c..d7c95c625cdbc 100644
int vm_usage; /* region usage count (access under nommu_region_sem) */ int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for bool vm_icache_flushed : 1; /* true if the icache has been flushed for
@@ -357,6 +358,7 @@ struct vm_area_struct { @@ -358,6 +359,7 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */ units */
struct file * vm_file; /* File we map to (can be NULL). */ struct file * vm_file; /* File we map to (can be NULL). */
...@@ -125,7 +125,7 @@ index 0974ad501a47c..d7c95c625cdbc 100644 ...@@ -125,7 +125,7 @@ index 0974ad501a47c..d7c95c625cdbc 100644
#ifdef CONFIG_SWAP #ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index d66cd1014211b..a2addc21d63fc 100644 index 426cd0c51f9eb..ea0ae494c6dde 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -555,7 +555,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -555,7 +555,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
......
include/uapi/linux/aufs_type.h
View file @ 21530afc
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.x-rcN-20210308" #define AUFS_VERSION "5.x-rcN-20210412"
/* todo? move this to linux-2.6.19/include/magic.h */ /* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') #define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
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