Commits · 7f53570fb1acd1eb6fdce122b7c1c36cd3ebc5cd · adam.huang / Aufs5 Standalone

16 Jan, 2020 29 commits
- Merge branch 'aufs5.x-rcN/01modular' into aufs5.x-rcN/30stdalone · 7f53570f
  J. R. Okajima authored Jan 16, 2020
  
  7f53570f
- Merge branch 'aufs5.4/30stdalone' into aufs5.x-rcN/30stdalone · 9ad3b2e9
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  9ad3b2e9
- Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular · 6126ac87
  J. R. Okajima authored Jan 16, 2020
  
  6126ac87
- Merge branch 'aufs5.4/01modular' into aufs5.x-rcN/01modular · 4bc100f0
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  4bc100f0
- Merge branch 'aufs5.4/00base' into aufs5.x-rcN/00base · f09ed45f
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  f09ed45f
- Merge branch 'aufs5.4/01modular' into aufs5.4/30stdalone · 26f5f0da
  J. R. Okajima authored Jan 16, 2020
  
  26f5f0da
- Merge branch 'aufs5.3/30stdalone' into aufs5.4/30stdalone · 639352a6
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  639352a6
- Merge branch 'aufs5.4/00base' into aufs5.4/01modular · 4ece71ce
  J. R. Okajima authored Jan 16, 2020
  
  4ece71ce
- 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.4/00base · 4be20808
  J. R. Okajima authored Jan 16, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	include/uapi/linux/aufs_type.h
```
  4be20808
- 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 3 commits

Merge branch 'aufs5.4/30stdalone' into aufs5.x-rcN/30stdalone · 1fc532ea
J. R. Okajima authored Jan 11, 2020

1fc532ea
Merge branch 'aufs5.3/30stdalone' into aufs5.4/30stdalone · edca3174
J. R. Okajima authored Jan 11, 2020

edca3174

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

08 Jan, 2020 8 commits
- Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular · 469fb36a
  J. R. Okajima authored Jan 08, 2020
  
  469fb36a
- Merge branch 'aufs5.x-rcN/01modular' into aufs5.x-rcN/30stdalone · 231e6082
  J. R. Okajima authored Jan 08, 2020
  
  231e6082
- aufs: for v5.5-rc1, remove an arg from rwsem_release() · ba1baefc
  J. R. Okajima authored Jan 08, 2020
```
Simply follows a change in mainline,
5facae4f3549 2019-10-09 locking/lockdep: Remove unused @nested argument from lock_release()
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
```
  ba1baefc
- Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular · ea5c3423
  J. R. Okajima authored Jan 08, 2020
  
  ea5c3423
- Merge branch 'aufs5.x-rcN/01modular' into aufs5.x-rcN/30stdalone · 999c6e07
  J. R. Okajima authored Jan 08, 2020
  
  999c6e07
- Merge branch 'aufs5.4/01modular' into aufs5.x-rcN/01modular · efcdacc1
  J. R. Okajima authored Jan 08, 2020
  
  efcdacc1
- Merge branch 'aufs5.4/30stdalone' into aufs5.x-rcN/30stdalone · 40315679
  J. R. Okajima authored Jan 08, 2020
  
  40315679
- Merge branch 'aufs5.4/00base' into aufs5.x-rcN/00base · e6194431
  J. R. Okajima authored Jan 08, 2020
  
  e6194431