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

diff --cc fs/nfs/filelayout/filelayoutdev.c
Simple merge

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

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

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

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

diff --cc fs/nfs/pnfs.h
Simple merge

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

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

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