Merge remote-tracking branch 'nfs-anna/linux-next'

diff --cc fs/lockd/svc.c
Simple merge

diff --cc include/linux/sunrpc/svc.h
Simple merge

diff --cc include/linux/sunrpc/xprt.h
Simple merge

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

diff --cc net/sunrpc/auth_gss/svcauth_gss.c
Simple merge

diff --cc net/sunrpc/debugfs.c
Simple merge

diff --cc net/sunrpc/svc.c
Simple merge

diff --cc net/sunrpc/xprt.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge