Commits · 111653cfc041de6e719f5f2df32f04882e7599c7 · adam.huang / Aufs5 Standalone · GitLab

16 Jan, 2020 10 commits
- 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.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
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/01modular' into aufs5.2/01modular · 2e91869a
  J. R. Okajima authored Dec 31, 2019
  
  2e91869a
- 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.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 13 commits
- 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
- Merge branch 'aufs5.1/30stdalone' into aufs5.2/30stdalone · 69919ad1
  J. R. Okajima authored Dec 18, 2019
  
  69919ad1
- 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.1/01modular' into aufs5.1/30stdalone · 2e3e8198
  J. R. Okajima authored Dec 18, 2019
  
  2e3e8198
- Merge branch 'aufs5.0/30stdalone' into aufs5.1/30stdalone · f05251c7
  J. R. Okajima authored Dec 18, 2019
  
  f05251c7
- 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
- Merge branch 'aufs5.0/01modular' into aufs5.1/01modular · 359da3f4
  J. R. Okajima authored Dec 18, 2019
  
  359da3f4
- Merge branch 'aufs5.0/01modular' into aufs5.0/30stdalone · 182c6af2
  J. R. Okajima authored Dec 18, 2019
  
  182c6af2
- Merge branch 'aufs5.0/00base' into aufs5.0/01modular · b3ac1e63
  J. R. Okajima authored Dec 18, 2019
  
  b3ac1e63
- aufs: minor bugfix, stop exposing kconfig to userspace · ae8204bd
  J. R. Okajima authored Dec 18, 2019
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
(cherry picked from commit 75664fa01701d5f79e6cee87a800354df6e70f70)
```
  ae8204bd
15 Dec, 2019 4 commits
- Merge branch 'aufs5.2/01modular' into aufs5.2/30stdalone · 65649b31
  J. R. Okajima authored Dec 15, 2019
  
  65649b31
- Merge branch 'aufs5.2/00base' into aufs5.2/01modular · 7a5ed099
  J. R. Okajima authored Dec 15, 2019
  
  7a5ed099
- Merge branch 'aufs5.1/30stdalone' into aufs5.2/30stdalone · 0cf27f20
  J. R. Okajima authored Dec 15, 2019
  
  0cf27f20
- Merge branch 'aufs5.1/01modular' into aufs5.2/01modular · e1b8cc6a
  J. R. Okajima authored Dec 15, 2019
  
  e1b8cc6a