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

diff --cc fs/Kconfig
Simple merge

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

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

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

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

diff --cc fs/nfsd/Kconfig
Simple merge

diff --cc include/linux/nfs_fs_sb.h
Simple merge

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