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

diff --cc fs/nfs/nfs4filelayout.c
Simple merge

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

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

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