backmerge AFS fixes that went into mainline and deal with
the conflict in fs/afs/fsclient.c
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>