David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
blocklayout	pnfs/blocklayout: fix last_write_offset incorrectly set to page boundary	2016-10-13 16:42:53 -04:00
filelayout	pNFS/files: filelayout_write_done_cb must call nfs_writeback_update_inode()	2016-07-21 09:46:42 -04:00
flexfilelayout	NFSv4.x: Allow callers of nfs_remove_bad_delegation() to specify a stateid	2016-09-27 14:33:37 -04:00
objlayout
cache_lib.c	NFS: cache_lib: use complete() instead of complete_all()	2016-09-23 09:40:12 -04:00
cache_lib.h
callback.c	NFSv4.x: hide array-bounds warning	2016-11-22 16:11:44 -05:00
callback.h	nfs: add handling for CB_NOTIFY_LOCK in client	2016-09-22 13:56:04 -04:00
callback_proc.c	nfs: allow blocking locks to be awoken by lock callbacks	2016-09-22 15:54:27 -04:00
callback_xdr.c	nfs: add handling for CB_NOTIFY_LOCK in client	2016-09-22 13:56:04 -04:00
client.c	NFS: Ignore connections that have cl_rpcclient uninitialized	2016-11-07 16:11:29 -05:00
delegation.c	NFS: Always call nfs_inode_find_state_and_recover() when revoking a delegation	2016-09-27 14:35:04 -04:00
delegation.h	NFSv4: nfs_inode_find_state_and_recover() should check all stateids	2016-09-27 14:34:35 -04:00
dir.c	NFS client updates for Linux 4.9	2016-10-13 21:28:20 -07:00
direct.c	NFS: direct: use complete() instead of complete_all()	2016-09-23 09:14:16 -04:00
dns_resolve.c
dns_resolve.h
file.c	NFS client updates for Linux 4.9	2016-10-13 21:28:20 -07:00
fscache-index.c
fscache.c
fscache.h
getroot.c
inode.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
internal.h	NFS client updates for Linux 4.9	2016-10-13 21:28:20 -07:00
io.c	NFS: Do not serialise O_DIRECT reads and writes	2016-07-05 19:11:04 -04:00
iostat.h
Kconfig
Makefile	NFS: Do not serialise O_DIRECT reads and writes	2016-07-05 19:11:04 -04:00
mount_clnt.c
namespace.c	NFS: Trim extra slash in v4 nfs_path	2016-10-24 12:06:01 -04:00
netns.h	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
nfs.h
nfs2super.c
nfs2xdr.c
nfs3_fs.h
nfs3acl.c
nfs3client.c	nfs4: flexfiles: respect noresvport when establishing connections to DSes	2016-07-19 16:23:25 -04:00
nfs3proc.c	vfs: Remove {get,set,remove}xattr inode operations	2016-10-07 21:48:36 -04:00
nfs3super.c
nfs3xdr.c
nfs4_fs.h	NFSv4: Fix CLOSE races with OPEN	2016-11-18 13:35:58 -05:00
nfs4client.c	nfs: allow blocking locks to be awoken by lock callbacks	2016-09-22 15:54:27 -04:00
nfs4file.c	switch generic_file_splice_read() to use of ->read_iter()	2016-10-05 18:23:56 -04:00
nfs4getroot.c
nfs4idmap.c
nfs4idmap.h
nfs4namespace.c	qstr: constify instances in nfs	2016-07-20 23:30:06 -04:00
nfs4proc.c	NFS client bugfixes for Linux 4.9 part 4	2016-11-23 14:43:40 -08:00
nfs4renewd.c	NFSv4: Cap the transport reconnection timer at 1/2 lease period	2016-08-05 19:22:22 -04:00
nfs4session.c	fs/nfs: Fix used uninitialized warn in nfs4_slot_seqid_in_use()	2016-11-07 16:11:30 -05:00
nfs4session.h	NFSv4.1: Don't deadlock the state manager on the SEQUENCE status flags	2016-09-27 14:31:27 -04:00
nfs4state.c	NFSv4.1: Handle NFS4ERR_OLD_STATEID in nfs4_reclaim_open_state	2016-11-18 14:27:27 -05:00
nfs4super.c
nfs4sysctl.c
nfs4trace.c
nfs4trace.h	tracing: Use __get_str() when manipulating strings	2016-07-15 15:52:20 -04:00
nfs4xdr.c	fs: nfs: Make nfs boot time y2038 safe	2016-10-04 16:20:26 -04:00
nfs42.h
nfs42proc.c	NFSv4.2: Fix a reference leak in nfs42_proc_layoutstats_generic	2016-10-04 16:30:54 -04:00
nfs42xdr.c	NFSv4.2: Fix warning "variable ‘stateids’ set but not used"	2016-07-24 17:36:06 -04:00
nfsroot.c
nfstrace.c
nfstrace.h	NFS client updates for Linux 4.8	2016-07-30 16:33:25 -07:00
pagelist.c	mm: remove page_file_index	2016-10-07 18:46:28 -07:00
pnfs.c	NFS: Don't print a pNFS error if we aren't using pNFS	2016-11-07 16:11:30 -05:00
pnfs.h	pnfs: add a new mechanism to select a layout driver according to an ordered list	2016-09-19 13:11:13 -04:00
pnfs_dev.c
pnfs_nfs.c	NFS pnfs data server multipath session trunking	2016-09-19 13:08:37 -04:00
proc.c	fs: rename "rename2" i_op to "rename"	2016-09-27 11:03:58 +02:00
read.c	mm: remove page_file_index	2016-10-07 18:46:28 -07:00
super.c	NFSv4.x: Add kernel parameter to control the callback server	2016-09-19 13:08:36 -04:00
symlink.c
sysctl.c
unlink.c	qstr: constify instances in nfs	2016-07-20 23:30:06 -04:00
write.c	mm: remove page_file_index	2016-10-07 18:46:28 -07:00