]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b77e7b1 b77cf41)
Merge tag 'afs-fixes-20180514' into afs-proc
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 2 Jun 2018 22:08:11 +0000 (18:08 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 2 Jun 2018 22:09:27 +0000 (18:09 -0400)
commitd44b7e475ec09925fc8af6f6d260477f2c235734
tree1c12675d523eaa34e01499ae2a70dc6983a1918btree | snapshot
parentb77e7b1e8eb1befc2da51aab5ffbd9656e89996dcommit | diff
parentb77cf41250bf461d2096f62bbfe62a2cb6ebf928commit | 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>
fs/afs/cmservice.c diff1 | diff2 | blob | history
fs/afs/fsclient.c diff1 | diff2 | blob | history
fs/afs/internal.h diff1 | diff2 | blob | history
fs/afs/rxrpc.c diff1 | diff2 | blob | history
fs/afs/super.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.