Commits · 960df581c16ad828515bba799c20470a56745e85 · adam.huang / Aufs5 Standalone · GitLab

16 Jan, 2020 13 commits
- 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
- 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/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
07 Jan, 2020 6 commits
- Merge branch 'aufs5.4/00base' into aufs5.4/01modular · eb75b95d
  J. R. Okajima authored Jan 07, 2020
  
  eb75b95d
- Merge branch 'aufs5.3/01modular' into aufs5.4/01modular · 1837e101
  J. R. Okajima authored Jan 07, 2020
  
  1837e101
- Merge branch 'aufs5.3/00base' into aufs5.4/00base · d1406b69
  J. R. Okajima authored Jan 07, 2020
  
  d1406b69
- Merge branch 'aufs5.3/00base' into aufs5.3/01modular · f51887f5
  J. R. Okajima authored Jan 07, 2020
  
  f51887f5
- Merge branch 'aufs5.2/01modular' into aufs5.3/01modular · fd649770
  J. R. Okajima authored Jan 07, 2020
  
  fd649770
- Merge branch 'aufs5.2/00base' into aufs5.3/00base · 0e79e049
  J. R. Okajima authored Jan 07, 2020
  
  0e79e049
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
19 Dec, 2019 2 commits
- Merge branch 'aufs5.4/00base' into aufs5.4/01modular · beac1d20
  J. R. Okajima authored Dec 19, 2019
  
  beac1d20
- aufs: v5.4 version string · 58a60be2
  J. R. Okajima authored Dec 19, 2019
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
```
  58a60be2
18 Dec, 2019 11 commits
- Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular · 8d16cc7c
  J. R. Okajima authored Dec 18, 2019
  
  8d16cc7c
- Merge branch 'aufs5.3/01modular' into aufs5.x-rcN/01modular · 51cba860
  J. R. Okajima authored Dec 18, 2019
  
  51cba860
- Merge branch 'aufs5.3/00base' into aufs5.x-rcN/00base · 0e7a1223
  J. R. Okajima authored Dec 18, 2019
  
  0e7a1223
- Merge branch 'aufs5.3/00base' into aufs5.3/01modular · 96d9b23e
  J. R. Okajima authored Dec 18, 2019
  
  96d9b23e
- Merge branch 'aufs5.2/00base' into aufs5.3/00base · 853d6db1
  J. R. Okajima authored Dec 18, 2019
  
  853d6db1
- Merge branch 'aufs5.2/01modular' into aufs5.3/01modular · 84eed716
  J. R. Okajima authored Dec 18, 2019
  
  84eed716
- 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