Merge tag 'afs-next-20190628' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...

Pull afs updates from David Howells:
 "A set of minor changes for AFS:

   - Remove an unnecessary check in afs_unlink()

   - Add a tracepoint for tracking callback management

   - Add a tracepoint for afs_server object usage

   - Use struct_size()

   - Add mappings for AFS UAE abort codes to Linux error codes, using
     symbolic names rather than hex numbers in the .c file"

* tag 'afs-next-20190628' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  afs: Add support for the UAE error table
  fs/afs: use struct_size() in kzalloc()
  afs: Trace afs_server usage
  afs: Add some callback management tracepoints
  afs: afs_unlink() doesn't need to check dentry->d_inode

diff --cc fs/afs/cmservice.c
Simple merge

diff --cc fs/afs/dir.c
Simple merge

diff --cc fs/afs/file.c
Simple merge

diff --cc fs/afs/fsclient.c
Simple merge

diff --cc fs/afs/internal.h
Simple merge

diff --cc fs/afs/misc.c
Simple merge

diff --cc fs/afs/rxrpc.c
Simple merge

diff --cc fs/afs/server.c
Simple merge

diff --cc fs/afs/server_list.c
Simple merge

diff --cc fs/afs/write.c
Simple merge

diff --cc include/trace/events/afs.h
Simple merge