Commits · 4d9505e296e8ea8cdafce3938fc8cf5887b1e584 · adam.huang / Aufs5 Standalone · GitLab

22 Jan, 2020 15 commits
- Merge branch 'aufs5.4/01modular' into aufs5.x-rcN/01modular · 4d9505e2
  J. R. Okajima authored Jan 22, 2020
  
  4d9505e2
- Merge branch 'aufs5.4/00base' into aufs5.4/01modular · 1f5bcbe8
  J. R. Okajima authored Jan 22, 2020
  
  1f5bcbe8
- Merge branch 'aufs5.3/01modular' into aufs5.4/01modular · c652bc61
  J. R. Okajima authored Jan 22, 2020
  
  c652bc61
- Merge branch 'aufs5.3/00base' into aufs5.4/00base · a97d537b
  J. R. Okajima authored Jan 22, 2020
  
  a97d537b
- Merge branch 'aufs5.3/00base' into aufs5.3/01modular · c7597c49
  J. R. Okajima authored Jan 22, 2020
  
  c7597c49
- Merge branch 'aufs5.2/01modular' into aufs5.3/01modular · a474dda0
  J. R. Okajima authored Jan 22, 2020
  
  a474dda0
- Merge branch 'aufs5.2/00base' into aufs5.3/00base · a9055d56
  J. R. Okajima authored Jan 22, 2020
  
  a9055d56
- Merge branch 'aufs5.2/00base' into aufs5.2/01modular · f859cdc5
  J. R. Okajima authored Jan 22, 2020
  
  f859cdc5
- Merge branch 'aufs5.1/01modular' into aufs5.2/01modular · e0a66bce
  J. R. Okajima authored Jan 22, 2020
  
  e0a66bce
- Merge branch 'aufs5.1/00base' into aufs5.2/00base · c7e63832
  J. R. Okajima authored Jan 22, 2020
  
  c7e63832
- Merge branch 'aufs5.1/00base' into aufs5.1/01modular · d4ec2c97
  J. R. Okajima authored Jan 22, 2020
  
  d4ec2c97
- Merge branch 'aufs5.0/01modular' into aufs5.1/01modular · 69ed9546
  J. R. Okajima authored Jan 22, 2020
  
  69ed9546
- Merge branch 'aufs5.0/00base' into aufs5.1/00base · dc5a1941
  J. R. Okajima authored Jan 22, 2020
  
  dc5a1941
- Merge branch 'aufs5.0/00base' into aufs5.0/01modular · e0e458ff
  J. R. Okajima authored Jan 22, 2020
  
  e0e458ff
- aufs: tiny, update the year in Copyright · e5e64fe5
  J. R. Okajima authored Jan 21, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
(cherry picked from commit 56b4b776c84f364384971c4cdfd66b4a2f0696d4)
```
  e5e64fe5
16 Jan, 2020 18 commits
- 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/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/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
08 Jan, 2020 5 commits
- Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular · 469fb36a
  J. R. Okajima authored Jan 08, 2020
  
  469fb36a
- 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.4/01modular' into aufs5.x-rcN/01modular · efcdacc1
  J. R. Okajima authored Jan 08, 2020
  
  efcdacc1
- Merge branch 'aufs5.4/00base' into aufs5.x-rcN/00base · e6194431
  J. R. Okajima authored Jan 08, 2020
  
  e6194431
07 Jan, 2020 2 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