Commits · a0f0da4ce0f9e02e9fd2b8d8f14a2cf1b84e4f98 · adam.huang / Aufs5 Standalone

16 Jan, 2020 19 commits
- Merge branch 'aufs5.3/01modular' into aufs5.3/30stdalone · a0f0da4c
  J. R. Okajima authored Jan 16, 2020
  
  a0f0da4c
- Merge branch 'aufs5.2/30stdalone' into aufs5.3/30stdalone · bca851aa
  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
```
  bca851aa
- 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/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
10 Jan, 2020 1 commit

aufs stdalone: for v5.3, new headers_install scheme · 9f6343d1

J. R. Okajima authored Dec 23, 2019

By the commits in mainline,
59b2bd05f5f4 2019-06-15 kbuild: add 'headers' target to build up uapi headers in usr/include
d5470d14431e 2019-06-15 kbuild: re-implement Makefile.headersinst without recursion
555187a8791d 2019-06-15 kbuild: simplify scripts/headers_install.sh

the scheme changed a little bit. Since aufs standalone GIT generates
and installs aufs_type.h to userspace, simply follow the new scheme.
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

9f6343d1

07 Jan, 2020 5 commits
- Merge branch 'aufs5.3/00base' into aufs5.3/01modular · f51887f5
  J. R. Okajima authored Jan 07, 2020
  
  f51887f5
- Merge branch 'aufs5.3/01modular' into aufs5.3/30stdalone · 1202f1fd
  J. R. Okajima authored Jan 07, 2020
  
  1202f1fd
- Merge branch 'aufs5.2/01modular' into aufs5.3/01modular · fd649770
  J. R. Okajima authored Jan 07, 2020
  
  fd649770
- Merge branch 'aufs5.2/30stdalone' into aufs5.3/30stdalone · 10930ef2
  J. R. Okajima authored Jan 07, 2020
  
  10930ef2
- Merge branch 'aufs5.2/00base' into aufs5.3/00base · 0e79e049
  J. R. Okajima authored Jan 07, 2020
  
  0e79e049
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 2 commits
- Merge branch 'aufs5.3/01modular' into aufs5.3/30stdalone · 648211b9
  J. R. Okajima authored Dec 18, 2019
  
  648211b9
- Merge branch 'aufs5.2/30stdalone' into aufs5.3/30stdalone · c6d1b934
  J. R. Okajima authored Dec 18, 2019
  
  c6d1b934