David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
datagram.c	net: Fix skb_set_peeked use-after-free bug	2015-08-06 21:55:47 -07:00
dev.c	net: introduce pre-change upper device notifier	2015-10-16 07:15:05 -07:00
dev_addr_lists.c
dev_ioctl.c
drop_monitor.c
dst.c	dst: Pass net into dst->output	2015-10-08 04:27:03 -07:00
ethtool.c	ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings	2015-10-14 19:00:20 -07:00
fib_rules.c	fib_rules: fix fib rule dumps across multiple skbs	2015-09-24 15:21:54 -07:00
filter.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
flow.c	flow: Move __get_hash_from_flowi{4,6} into flow_dissector.c	2015-09-01 17:00:24 -07:00
flow_dissector.c	flow_dissector: Use 'const' where possible.	2015-09-01 21:19:17 -07:00
gen_estimator.c
gen_stats.c
link_watch.c
lwtunnel.c	dst: Pass net into dst->output	2015-10-08 04:27:03 -07:00
Makefile	lwtunnel: infrastructure for handling light weight tunnels like mpls	2015-07-21 10:39:03 -07:00
neighbour.c	net: Add support for filtering neigh dump by device index	2015-10-07 04:12:02 -07:00
net-procfs.c
net-sysfs.c	switchdev: rename SWITCHDEV_ATTR_* enum values to SWITCHDEV_ATTR_ID_*	2015-10-03 04:49:37 -07:00
net-sysfs.h
net-traces.c	net: FIB tracepoints	2015-08-29 13:05:16 -07:00
net_namespace.c
netclassid_cgroup.c	cgroup: net_cls: fix false-positive "suspicious RCU usage"	2015-07-25 00:13:18 -07:00
netevent.c
netpoll.c	netpoll: Drop budget parameter from NAPI polling call hierarchy	2015-09-29 14:57:16 -07:00
netprio_cgroup.c
pktgen.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-08-13 16:23:11 -07:00
ptp_classifier.c
request_sock.c	tcp: restore fastopen operations	2015-10-05 03:19:06 -07:00
rtnetlink.c	net/core: lockdep_rtnl_is_held can be boolean	2015-10-09 07:49:06 -07:00
scm.c
secure_seq.c
skbuff.c	skbuff: Fix skb checksum partial check.	2015-09-29 16:48:46 -07:00
sock.c	net: SO_INCOMING_CPU setsockopt() support	2015-10-12 19:28:20 -07:00
sock_diag.c	net/core: make sock_diag.c explicitly non-modular	2015-10-09 07:52:27 -07:00
stream.c
sysctl_net_core.c
timestamping.c
tso.c
utils.c	net: move net_get_random_once to lib	2015-10-08 05:26:35 -07:00