Commits · 5c1fce1929c0b1bdbe1c621e0193dbd32a33c198 · adam.huang / Aufs5 Standalone · GitLab

16 Jan, 2020 15 commits
- Merge branch 'aufs5.2/30stdalone' into aufs5.2.5+/30stdalone · 5c1fce19
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  5c1fce19
- 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
- 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 5 commits
- Merge branch 'aufs5.2.5+/01modular' into aufs5.2.5+/30stdalone · 47fbca95
  J. R. Okajima authored Jan 06, 2020
  
  47fbca95
- Merge branch 'aufs5.2/30stdalone' into aufs5.2.5+/30stdalone · 6a4ec725
  J. R. Okajima authored Jan 06, 2020
  
  6a4ec725
- 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 13 commits
- Merge branch 'aufs5.2/01modular' into aufs5.2/30stdalone · c2345cd6
  J. R. Okajima authored Dec 31, 2019
  
  c2345cd6
- Merge branch 'aufs5.1/30stdalone' into aufs5.2/30stdalone · 26e49063
  J. R. Okajima authored Dec 31, 2019
  
  26e49063
- 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/01modular' into aufs5.1/30stdalone · 98d0d59e
  J. R. Okajima authored Dec 31, 2019
  
  98d0d59e
- Merge branch 'aufs5.0/30stdalone' into aufs5.1/30stdalone · f36db818
  J. R. Okajima authored Dec 31, 2019
  
  f36db818
- 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/01modular' into aufs5.0/30stdalone · 6f3c0134
  J. R. Okajima authored Dec 31, 2019
  
  6f3c0134
- 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 7 commits
- Merge branch 'aufs5.2.5+/01modular' into aufs5.2.5+/30stdalone · 1a9bd6f7
  J. R. Okajima authored Dec 18, 2019
  
  1a9bd6f7
- Merge branch 'aufs5.2.5+/00base' into aufs5.2.5+/01modular · cf3c1948
  J. R. Okajima authored Dec 18, 2019
  
  cf3c1948
- Merge branch 'aufs5.2/30stdalone' into aufs5.2.5+/30stdalone · 31ce55b7
  J. R. Okajima authored Dec 18, 2019
  
  31ce55b7
- 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/01modular' into aufs5.2/30stdalone · f0d6c58e
  J. R. Okajima authored Dec 18, 2019
  
  f0d6c58e
- Merge branch 'aufs5.2/00base' into aufs5.2/01modular · cfeff2e3
  J. R. Okajima authored Dec 18, 2019
  
  cfeff2e3