Commits · d082a0694524c30063c35da57d740fcd00f1b9bc · adam.huang / Aufs5 Standalone · GitLab

22 Jan, 2020 9 commits
- Merge branch 'aufs5.2/01modular' into aufs5.2.5+/01modular · d082a069
  J. R. Okajima authored Jan 22, 2020
  
  d082a069
- 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/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/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 12 commits
- Merge branch 'aufs5.2.5+/00base' into aufs5.2.5+/01modular · fa7dc575
  J. R. Okajima authored Jan 16, 2020
  
  fa7dc575
- Merge branch 'aufs5.2/01modular' into aufs5.2.5+/01modular · 9048fb95
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

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

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  ac79b2b2
- 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/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/00base' into aufs5.0/01modular · 178371bc
  J. R. Okajima authored Jan 16, 2020
  
  178371bc
- aufs: tiny, cosmetic level changes · 96a34870
  J. R. Okajima authored Jan 15, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
(cherry picked from commit 0f5f91bda77d0690c23732fd2592ae97c908a704)
```
  96a34870
- aufs: possible bugfix, for userspace use limits.h instead of linux/limits.h · d2df5e21
  J. R. Okajima authored Jan 11, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
(cherry picked from commit 9e47f923ad8bf55c272fed3d3699fa5df14b6f72)
```
  d2df5e21
06 Jan, 2020 3 commits
- Merge branch 'aufs5.2.5+/00base' into aufs5.2.5+/01modular · 35431459
  J. R. Okajima authored Jan 06, 2020
  
  35431459
- Merge branch 'aufs5.2/01modular' into aufs5.2.5+/01modular · 97590ec6
  J. R. Okajima authored Jan 06, 2020
  
  97590ec6
- Merge branch 'aufs5.2/00base' into aufs5.2.5+/00base · 2bfd0f03
  J. R. Okajima authored Jan 06, 2020
  
  2bfd0f03
31 Dec, 2019 8 commits
- Merge branch 'aufs5.2/00base' into aufs5.2/01modular · 4c858060
  J. R. Okajima authored Dec 31, 2019
  
  4c858060
- Merge branch 'aufs5.1/00base' into aufs5.2/00base · 6f2a4f12
  J. R. Okajima authored Dec 31, 2019
  
  6f2a4f12
- Merge branch 'aufs5.1/01modular' into aufs5.2/01modular · 2e91869a
  J. R. Okajima authored Dec 31, 2019
  
  2e91869a
- Merge branch 'aufs5.1/00base' into aufs5.1/01modular · dc6ece89
  J. R. Okajima authored Dec 31, 2019
  
  dc6ece89
- Merge branch 'aufs5.0/00base' into aufs5.1/00base · 3dde4087
  J. R. Okajima authored Dec 31, 2019
  
  3dde4087
- Merge branch 'aufs5.0/01modular' into aufs5.1/01modular · 8e2214c0
  J. R. Okajima authored Dec 31, 2019
  
  8e2214c0
- Merge branch 'aufs5.0/00base' into aufs5.0/01modular · 92d171d4
  J. R. Okajima authored Dec 31, 2019
  
  92d171d4
- aufs doc: LSM may be a good additional info · d75d3482
  J. R. Okajima authored Dec 31, 2019
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
(cherry picked from commit 7555811a8741218089016a6abed15a440baca476)
```
  d75d3482
18 Dec, 2019 8 commits
- Merge branch 'aufs5.2.5+/00base' into aufs5.2.5+/01modular · cf3c1948
  J. R. Okajima authored Dec 18, 2019
  
  cf3c1948
- Merge branch 'aufs5.2/00base' into aufs5.2.5+/00base · e933bb5c
  J. R. Okajima authored Dec 18, 2019
  
  e933bb5c
- Merge branch 'aufs5.2/01modular' into aufs5.2.5+/01modular · 718de492
  J. R. Okajima authored Dec 18, 2019
  
  718de492
- Merge branch 'aufs5.2/00base' into aufs5.2/01modular · cfeff2e3
  J. R. Okajima authored Dec 18, 2019
  
  cfeff2e3
- Merge branch 'aufs5.1/01modular' into aufs5.2/01modular · 1eb909b4
  J. R. Okajima authored Dec 18, 2019
  
  1eb909b4
- Merge branch 'aufs5.1/00base' into aufs5.2/00base · 37f0822a
  J. R. Okajima authored Dec 18, 2019
  
  37f0822a
- Merge branch 'aufs5.0/00base' into aufs5.1/00base · 9461f0e1
  J. R. Okajima authored Dec 18, 2019
  
  9461f0e1
- Merge branch 'aufs5.1/00base' into aufs5.1/01modular · a38e9ef1
  J. R. Okajima authored Dec 18, 2019
  
  a38e9ef1