| commit | de52cf922a4a17d0a4cd34d697db62a01c1bd092 | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Sat Jun 02 18:08:11 2018 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Sat Jun 02 18:09:27 2018 -0400 |
| tree | 1c12675d523eaa34e01499ae2a70dc6983a1918b | |
| parent | 5b86d4ff5dce3271dff54119e06174dc22422903 [diff] | |
| parent | 4776cab43fd3111618112737a257dc3ef368eddd [diff] |
Merge tag 'afs-fixes-20180514' into afs-proc backmerge AFS fixes that went into mainline and deal with the conflict in fs/afs/fsclient.c Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>