Commits · 0ffde8c909db096d20e4a244a4f96b132994a16a · adam.huang / Aufs5 Standalone

"plugins/vscode:/vscode.git/clone" did not exist on "1e7033d6600823d90cbadcaa7ea696ee7a88afe8"

22 Jan, 2020 29 commits
- Merge branch 'aufs5.4.3/30stdalone' into aufs5.4.3/39public · 0ffde8c9
  J. R. Okajima authored Jan 22, 2020
  
  0ffde8c9
- Merge branch 'aufs5.4.3/01modular' into aufs5.4.3/30stdalone · ce2168c3
  J. R. Okajima authored Jan 22, 2020
  
  ce2168c3
- Merge branch 'aufs5.4/30stdalone' into aufs5.4.3/30stdalone · 5a596d70
  J. R. Okajima authored Jan 22, 2020
  
  5a596d70
- Merge branch 'aufs5.4.3/00base' into aufs5.4.3/01modular · bd42b7f6
  J. R. Okajima authored Jan 22, 2020
  
  bd42b7f6
- Merge branch 'aufs5.4/01modular' into aufs5.4.3/01modular · 274e5a0c
  J. R. Okajima authored Jan 22, 2020
  
  274e5a0c
- Merge branch 'aufs5.4/00base' into aufs5.4.3/00base · c904a531
  J. R. Okajima authored Jan 22, 2020
  
  c904a531
- Merge branch 'aufs5.4/01modular' into aufs5.4/30stdalone · cc2a75c5
  J. R. Okajima authored Jan 22, 2020
  
  cc2a75c5
- Merge branch 'aufs5.4/00base' into aufs5.4/01modular · 1f5bcbe8
  J. R. Okajima authored Jan 22, 2020
  
  1f5bcbe8
- Merge branch 'aufs5.3/30stdalone' into aufs5.4/30stdalone · 71419c0c
  J. R. Okajima authored Jan 22, 2020
  
  71419c0c
- Merge branch 'aufs5.3/01modular' into aufs5.4/01modular · c652bc61
  J. R. Okajima authored Jan 22, 2020
  
  c652bc61
- Merge branch 'aufs5.3/00base' into aufs5.4/00base · a97d537b
  J. R. Okajima authored Jan 22, 2020
  
  a97d537b
- 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/au...
```
  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
17 Jan, 2020 1 commit
- aufs5.4.3 20200120 · a139e8c2
  J. R. Okajima authored Jan 18, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
```
  a139e8c2
16 Jan, 2020 10 commits
- Merge branch 'aufs5.4.3/30stdalone' into aufs5.4.3/39public · 19465ed4
  J. R. Okajima authored Jan 17, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  19465ed4
- Merge branch 'aufs5.4.3/01modular' into aufs5.4.3/30stdalone · 59b6aaf4
  J. R. Okajima authored Jan 16, 2020
  
  59b6aaf4
- Merge branch 'aufs5.4/30stdalone' into aufs5.4.3/30stdalone · 4739c591
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  4739c591
- Merge branch 'aufs5.4.3/00base' into aufs5.4.3/01modular · 7a16a49a
  J. R. Okajima authored Jan 16, 2020
  
  7a16a49a
- Merge branch 'aufs5.4/01modular' into aufs5.4.3/01modular · cdf35d95
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

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

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

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  639352a6
- Merge branch 'aufs5.4/00base' into aufs5.4/01modular · 4ece71ce
  J. R. Okajima authored Jan 16, 2020
  
  4ece71ce
- Merge branch 'aufs5.3/01modular' into aufs5.4/01modular · 960df581
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  960df581