Commits · 14a3228b37bd2f0459658c9a0eb8504fabce04a5 · adam.huang / Aufs5 Standalone · GitLab

21 Jun, 2020 4 commits
- Merge branch 'aufs5.x-rcN/30stdalone' into aufs5.x-rcN/39public · 14a3228b
  J. R. Okajima authored Jun 21, 2020
  
  14a3228b
- Merge branch 'aufs5.x-rcN/01modular' into aufs5.x-rcN/30stdalone · 9530b203
  J. R. Okajima authored Jun 21, 2020
  
  9530b203
- Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular · 667b38e4
  J. R. Okajima authored Jun 21, 2020
  
  667b38e4
- Revert "aufs: version 5.7" · 31475468
  J. R. Okajima authored Jun 21, 2020
```
This reverts commit 553ac776.
```
  31475468
20 Jun, 2020 8 commits
- Merge branch 'aufs5.7/01modular' into aufs5.7/30stdalone · 7150b3ae
  J. R. Okajima authored Jun 20, 2020
  
  7150b3ae
- Merge branch 'aufs5.7/00base' into aufs5.7/01modular · d8f3e5d7
  J. R. Okajima authored Jun 20, 2020
  
  d8f3e5d7
- aufs: version 5.7 · 553ac776
  J. R. Okajima authored Jun 20, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
```
  553ac776
- Merge branch 'aufs5.x-rcN/01modular' into aufs5.x-rcN/30stdalone · 1fb54858
  J. R. Okajima authored Jun 20, 2020
  
  1fb54858
- Merge branch 'aufs5.6/30stdalone' into aufs5.x-rcN/30stdalone · 99925e83
  J. R. Okajima authored Jun 20, 2020
  
  99925e83
- Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular · 69e53eb5
  J. R. Okajima authored Jun 20, 2020
  
  69e53eb5
- Merge branch 'aufs5.6/01modular' into aufs5.x-rcN/01modular · a7bd124a
  J. R. Okajima authored Jun 20, 2020
  
  a7bd124a
- Merge branch 'aufs5.6/00base' into aufs5.x-rcN/00base · 1a8e9551
  J. R. Okajima authored Jun 20, 2020
  
  1a8e9551
19 Jun, 2020 15 commits
- Merge branch 'aufs5.6/01modular' into aufs5.6/30stdalone · a70b44bb
  J. R. Okajima authored Jun 19, 2020
  
  a70b44bb
- Merge branch 'aufs5.5/30stdalone' into aufs5.6/30stdalone · dafc38db
  J. R. Okajima authored Jun 19, 2020
  
  dafc38db
- Merge branch 'aufs5.6/00base' into aufs5.6/01modular · 95baeb19
  J. R. Okajima authored Jun 19, 2020
  
  95baeb19
- Merge branch 'aufs5.5/00base' into aufs5.6/00base · 829f7ae0
  J. R. Okajima authored Jun 19, 2020
  
  829f7ae0
- Merge branch 'aufs5.5/01modular' into aufs5.6/01modular · 71bac5c6
  J. R. Okajima authored Jun 19, 2020
  
  71bac5c6
- Merge branch 'aufs5.5/01modular' into aufs5.5/30stdalone · 60b623b7
  J. R. Okajima authored Jun 19, 2020
  
  60b623b7
- Merge branch 'aufs5.5/00base' into aufs5.5/01modular · 4c49124e
  J. R. Okajima authored Jun 19, 2020
  
  4c49124e
- Merge branch 'aufs5.4/30stdalone' into aufs5.5/30stdalone · 895225d5
  J. R. Okajima authored Jun 19, 2020
  
  895225d5
- Merge branch 'aufs5.4/01modular' into aufs5.5/01modular · 0efade99
  J. R. Okajima authored Jun 19, 2020
  
  0efade99
- Merge branch 'aufs5.4/00base' into aufs5.5/00base · 8edaa4ba
  J. R. Okajima authored Jun 19, 2020
  
  8edaa4ba
- Merge branch 'aufs5.4/01modular' into aufs5.4/30stdalone · 8783b512
  J. R. Okajima authored Jun 19, 2020
  
  8783b512
- Merge branch 'aufs5.3/30stdalone' into aufs5.4/30stdalone · 11cd1c59
  J. R. Okajima authored Jun 19, 2020
  
  11cd1c59
- Merge branch 'aufs5.4/00base' into aufs5.4/01modular · acbcc25d
  J. R. Okajima authored Jun 19, 2020
  
  acbcc25d
- Merge branch 'aufs5.3/00base' into aufs5.4/00base · 976adcc3
  J. R. Okajima authored Jun 19, 2020
  
  976adcc3
- Merge branch 'aufs5.3/01modular' into aufs5.4/01modular · 168e4424
  J. R. Okajima authored Jun 19, 2020
  
  168e4424
18 Jun, 2020 13 commits
- Merge branch 'aufs5.3/01modular' into aufs5.3/30stdalone · 7e561c73
  J. R. Okajima authored Jun 18, 2020
  
  7e561c73
- Merge branch 'aufs5.2/30stdalone' into aufs5.3/30stdalone · 97e6e9c6
  J. R. Okajima authored Jun 18, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	fs/aufs/branch.c
```
  97e6e9c6
- Merge branch 'aufs5.3/00base' into aufs5.3/01modular · 8befbcd4
  J. R. Okajima authored Jun 18, 2020
  
  8befbcd4
- Merge branch 'aufs5.2/01modular' into aufs5.3/01modular · b1f375f2
  J. R. Okajima authored Jun 18, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

# Conflicts:
#	fs/aufs/branch.c
```
  b1f375f2
- Merge branch 'aufs5.2/00base' into aufs5.3/00base · 8f6fe4e5
  J. R. Okajima authored Jun 18, 2020
```
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
```
  8f6fe4e5
- Merge branch 'aufs5.2/01modular' into aufs5.2/30stdalone · e585343d
  J. R. Okajima authored Jun 18, 2020
  
  e585343d
- Merge branch 'aufs5.1/30stdalone' into aufs5.2/30stdalone · 72102507
  J. R. Okajima authored Jun 18, 2020
  
  72102507
- Merge branch 'aufs5.2/00base' into aufs5.2/01modular · 84f677d7
  J. R. Okajima authored Jun 18, 2020
  
  84f677d7
- Merge branch 'aufs5.1/01modular' into aufs5.2/01modular · 4ec81248
  J. R. Okajima authored Jun 18, 2020
  
  4ec81248
- Merge branch 'aufs5.1/00base' into aufs5.2/00base · db6a55a5
  J. R. Okajima authored Jun 18, 2020
  
  db6a55a5
- Merge branch 'aufs5.1/01modular' into aufs5.1/30stdalone · 98fa29df
  J. R. Okajima authored Jun 18, 2020
  
  98fa29df
- Merge branch 'aufs5.0/30stdalone' into aufs5.1/30stdalone · d85a88de
  J. R. Okajima authored Jun 18, 2020
  
  d85a88de
- Merge branch 'aufs5.1/00base' into aufs5.1/01modular · cb092288
  J. R. Okajima authored Jun 18, 2020
  
  cb092288