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
..
addr.c
addr.h
bcast.c	tipc: fix broadcast link synchronization problem	2016-10-29 17:21:09 -04:00
bcast.h	tipc: fix broadcast link synchronization problem	2016-10-29 17:21:09 -04:00
bearer.c
bearer.h
core.c	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
core.h	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
discover.c
discover.h
eth_media.c
ib_media.c
Kconfig
link.c	tipc: fix compatibility bug in link monitoring	2016-11-25 20:06:18 -05:00
link.h
Makefile
monitor.c	tipc: improve sanity check for received domain records	2016-11-25 20:06:18 -05:00
monitor.h
msg.c
msg.h	tipc: rename struct tipc_skb_cb member handle to bytes_read	2016-11-01 11:53:23 -04:00
name_distr.c	tipc: fix broadcast link synchronization problem	2016-10-29 17:21:09 -04:00
name_distr.h
name_table.c
name_table.h
net.c
net.h
netlink_compat.c	genetlink: mark families as __ro_after_init	2016-10-27 16:16:09 -04:00
netlink.c	genetlink: mark families as __ro_after_init	2016-10-27 16:16:09 -04:00
netlink.h
node.c	tipc: fix broadcast link synchronization problem	2016-10-29 17:21:09 -04:00
node.h
server.c
server.h
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
socket.h
subscr.c
subscr.h
sysctl.c
udp_media.c	tipc: info leak in __tipc_nl_add_udp_addr()	2016-10-13 12:10:01 -04:00
udp_media.h