Commits · f80af7fe7f51f1f1717c35d852b9cba6f9b19911 · adam.huang / Aufs5 Standalone

22 Jan, 2020 19 commits

Merge branch 'aufs5.3/30stdalone' into aufs5.3.16/30stdalone · f80af7fe
J. R. Okajima authored Jan 22, 2020

f80af7fe
Merge branch 'aufs5.3/01modular' into aufs5.3/30stdalone · 0d788634
J. R. Okajima authored Jan 22, 2020

0d788634
Merge branch 'aufs5.2/30stdalone' into aufs5.3/30stdalone · ac9d45c0
J. R. Okajima authored Jan 22, 2020

ac9d45c0
Merge branch 'aufs5.3/00base' into aufs5.3/01modular · c7597c49
J. R. Okajima authored Jan 22, 2020

c7597c49
Merge branch 'aufs5.2/01modular' into aufs5.3/01modular · a474dda0
J. R. Okajima authored Jan 22, 2020

a474dda0
Merge branch 'aufs5.2/00base' into aufs5.3/00base · a9055d56
J. R. Okajima authored Jan 22, 2020

a9055d56
Merge branch 'aufs5.2/01modular' into aufs5.2/30stdalone · 5ec4a2bd
J. R. Okajima authored Jan 22, 2020

5ec4a2bd
Merge branch 'aufs5.1/30stdalone' into aufs5.2/30stdalone · c1b1aa86
J. R. Okajima authored Jan 22, 2020

c1b1aa86
Merge branch 'aufs5.2/00base' into aufs5.2/01modular · f859cdc5
J. R. Okajima authored Jan 22, 2020

f859cdc5
Merge branch 'aufs5.1/01modular' into aufs5.2/01modular · e0a66bce
J. R. Okajima authored Jan 22, 2020

e0a66bce
Merge branch 'aufs5.1/00base' into aufs5.2/00base · c7e63832
J. R. Okajima authored Jan 22, 2020

c7e63832
Merge branch 'aufs5.1/01modular' into aufs5.1/30stdalone · b851bc55
J. R. Okajima authored Jan 22, 2020

b851bc55
Merge branch 'aufs5.0/30stdalone' into aufs5.1/30stdalone · dc3eb456
J. R. Okajima authored Jan 22, 2020

dc3eb456
Merge branch 'aufs5.1/00base' into aufs5.1/01modular · d4ec2c97
J. R. Okajima authored Jan 22, 2020

d4ec2c97
Merge branch 'aufs5.0/01modular' into aufs5.1/01modular · 69ed9546
J. R. Okajima authored Jan 22, 2020

69ed9546
Merge branch 'aufs5.0/00base' into aufs5.1/00base · dc5a1941
J. R. Okajima authored Jan 22, 2020

dc5a1941

Merge branch 'aufs5.0/01modular' into aufs5.0/30stdalone · 47ae6e65

J. R. Okajima authored Jan 22, 2020


Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	Documentation/filesystems/aufs/design/01intro.txt
#	Documentation/filesystems/aufs/design/02struct.txt
#	Documentation/filesystems/aufs/design/03atomic_open.txt
#	Documentation/filesystems/aufs/design/03lookup.txt
#	Documentation/filesystems/aufs/design/04branch.txt
#	Documentation/filesystems/aufs/design/05wbr_policy.txt
#	Documentation/filesystems/aufs/design/06dirren.txt
#	Documentation/filesystems/aufs/design/06fhsm.txt
#	Documentation/filesystems/aufs/design/06mmap.txt
#	Documentation/filesystems/aufs/design/06xattr.txt
#	Documentation/filesystems/aufs/design/07export.txt
#	Documentation/filesystems/aufs/design/08shwh.txt
#	Documentation/filesystems/aufs/design/10dynop.txt
#	fs/aufs/aufs.h
#	fs/aufs/branch.c
#	fs/aufs/branch.h
#	fs/aufs/cpup.c
#	fs/aufs/cpup.h
#	fs/aufs/dbgaufs.c
#	fs/aufs/dbgaufs.h
#	fs/aufs/dcsub.c
#	fs/aufs/dcsub.h
#	fs/aufs/debug.c
#	fs/aufs/debug.h
#	fs/aufs/dentry.c
#	fs/aufs/dentry.h
#	fs/aufs/dinfo.c
#	fs/aufs/dir.c
#	fs/aufs/dir.h
#	fs/aufs/dirren.c
#	fs/aufs/dirren.h
#	fs/aufs/dynop.c
#	fs/aufs/dynop.h
#	fs/aufs/export.c
#	fs/aufs/f_op.c
#	fs/aufs/fhsm.c
#	fs/aufs/file.c
#	fs/aufs/file.h
#	fs/aufs/finfo.c
#	fs/aufs/fstype.h
#	fs/aufs/hbl.h
#	fs/aufs/hfsnotify.c
#	fs/aufs/hfsplus.c
#	fs/aufs/hnotify.c
#	fs/aufs/i_op.c
#	fs/aufs/i_op_add.c
#	fs/aufs/i_op_del.c
#	fs/aufs/i_op_ren.c
#	fs/aufs/iinfo.c
#	fs/aufs/inode.c
#	fs/aufs/inode.h
#	fs/aufs/ioctl.c
#	fs/aufs/lcnt.h
#	fs/aufs/loop.c
#	fs/aufs/loop.h
#	fs/aufs/module.c
#	fs/aufs/module.h
#	fs/aufs/mvdown.c
#	fs/aufs/opts.c
#	fs/aufs/opts.h
#	fs/aufs/plink.c
#	fs/aufs/poll.c
#	fs/aufs/posix_acl.c
#	fs/aufs/procfs.c
#	fs/aufs/rdu.c
#	fs/aufs/rwsem.h
#	fs/aufs/sbinfo.c
#	fs/aufs/super.c
#	fs/aufs/super.h
#	fs/aufs/sysaufs.c
#	fs/aufs/sysaufs.h
#	fs/aufs/sysfs.c
#	fs/aufs/sysrq.c
#	fs/aufs/vdir.c
#	fs/aufs/vfsub.c
#	fs/aufs/vfsub.h
#	fs/aufs/wbr_policy.c
#	fs/aufs/whout.c
#	fs/aufs/whout.h
#	fs/aufs/wkq.c
#	fs/aufs/wkq.h
#	fs/aufs/xattr.c
#	fs/aufs/xino.c
#	include/uapi/linux/aufs_type.h

47ae6e65

Merge branch 'aufs5.0/00base' into aufs5.0/01modular · e0e458ff
J. R. Okajima authored Jan 22, 2020

e0e458ff

aufs: tiny, update the year in Copyright · e5e64fe5

J. R. Okajima authored Jan 21, 2020


Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
(cherry picked from commit 56b4b776c84f364384971c4cdfd66b4a2f0696d4)

e5e64fe5

16 Jan, 2020 21 commits
- Merge branch 'aufs5.3.16/01modular' into aufs5.3.16/30stdalone · 90296238
  J. R. Okajima authored Jan 16, 2020
  
  90296238
- Merge branch 'aufs5.3/30stdalone' into aufs5.3.16/30stdalone · d74559af
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  d74559af
- Merge branch 'aufs5.3.16/00base' into aufs5.3.16/01modular · 1c1d5a97
  J. R. Okajima authored Jan 16, 2020
  
  1c1d5a97
- Merge branch 'aufs5.3/01modular' into aufs5.3.16/01modular · f3efd558
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  f3efd558
- Merge branch 'aufs5.3/00base' into aufs5.3.16/00base · b527eb67
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  b527eb67
- Merge branch 'aufs5.3/01modular' into aufs5.3/30stdalone · a0f0da4c
  J. R. Okajima authored Jan 16, 2020
  
  a0f0da4c
- Merge branch 'aufs5.2/30stdalone' into aufs5.3/30stdalone · bca851aa
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	fs/aufs/i_op.c
#	include/uapi/linux/aufs_type.h
```
  bca851aa
- Merge branch 'aufs5.3/00base' into aufs5.3/01modular · 5a6c72bc
  J. R. Okajima authored Jan 16, 2020
  
  5a6c72bc
- Merge branch 'aufs5.2/01modular' into aufs5.3/01modular · c2d4af19
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	fs/aufs/i_op.c
#	include/uapi/linux/aufs_type.h
```
  c2d4af19
- Merge branch 'aufs5.2/00base' into aufs5.3/00base · 0e58b612
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	fs/aufs/i_op.c
#	include/uapi/linux/aufs_type.h
```
  0e58b612
- Merge branch 'aufs5.2/01modular' into aufs5.2/30stdalone · 018ab4a1
  J. R. Okajima authored Jan 16, 2020
  
  018ab4a1
- Merge branch 'aufs5.1/30stdalone' into aufs5.2/30stdalone · 111653cf
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  111653cf
- Merge branch 'aufs5.2/00base' into aufs5.2/01modular · 7ce4eafc
  J. R. Okajima authored Jan 16, 2020
  
  7ce4eafc
- Merge branch 'aufs5.1/01modular' into aufs5.2/01modular · b735887b
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  b735887b
- Merge branch 'aufs5.1/00base' into aufs5.2/00base · 0cf2a52d
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  0cf2a52d
- Merge branch 'aufs5.1/01modular' into aufs5.1/30stdalone · 9987a951
  J. R. Okajima authored Jan 16, 2020
  
  9987a951
- Merge branch 'aufs5.0/30stdalone' into aufs5.1/30stdalone · c12cb59e
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  c12cb59e
- Merge branch 'aufs5.1/00base' into aufs5.1/01modular · c11cf50a
  J. R. Okajima authored Jan 16, 2020
  
  c11cf50a
- Merge branch 'aufs5.0/01modular' into aufs5.1/01modular · 9f3ddffe
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  9f3ddffe
- Merge branch 'aufs5.0/00base' into aufs5.1/00base · 2aae0444
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  2aae0444
- Merge branch 'aufs5.0/01modular' into aufs5.0/30stdalone · 58b60da0
  J. R. Okajima authored Jan 16, 2020
  
  58b60da0