David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
datagram.c	net: Fix inverted test in __skb_recv_datagram	2015-12-08 11:30:17 -05:00
dev_addr_lists.c	net: fix spelling for synchronized	2014-11-18 15:26:32 -05:00
dev_ioctl.c	dev_ioctl: use sizeof(x) instead of sizeof x	2014-11-18 15:27:32 -05:00
dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
drop_monitor.c	net: Replace get_cpu_var through this_cpu_ptr	2014-08-26 13:45:47 -04:00
dst_cache.c	net: add dst_cache support	2016-02-16 20:21:48 -05:00
dst.c	net: add dst_cache to ovs vxlan lwtunnel	2016-02-16 20:21:48 -05:00
ethtool.c	net/ethtool: support set coalesce per queue	2016-02-19 22:54:10 -05:00
fib_rules.c	fib_rules: fix fib rule dumps across multiple skbs	2015-09-24 15:21:54 -07:00
filter.c	bpf: don't emit mov A,A on return	2016-02-21 22:07:11 -05:00
flow_dissector.c	net: Copy inner L3 and L4 headers as unaligned on GRE TEB	2016-02-16 15:25:01 -05:00
flow.c	flow: Move __get_hash_from_flowi{4,6} into flow_dissector.c	2015-09-01 17:00:24 -07:00
gen_estimator.c	net_sched: gen_estimator: extend pps limit	2015-07-08 13:59:20 -07:00
gen_stats.c	gen_stats.c: Duplicate xstats buffer for later use	2015-02-19 15:45:53 -05:00
link_watch.c	dev: introduce dev_get_iflink()	2015-04-02 14:04:59 -04:00
lwtunnel.c	lwtunnel: autoload of lwt modules	2016-02-21 22:00:28 -05:00
Makefile	net: add dst_cache support	2016-02-16 20:21:48 -05:00
neighbour.c	net/neighbour: fix crash at dumping device-agnostic proxy entries	2015-12-03 00:07:51 -05:00
net_namespace.c	netns: make nsid_lock per net	2015-05-17 23:41:11 -04:00
net-procfs.c	rps: selective flow shedding during softnet overflow	2013-05-20 13:48:04 -07:00
net-sysfs.c	net-sysfs: remove unused fmt_long_hex	2016-02-18 10:01:15 -05:00
net-sysfs.h	net: netdev_kobject_init: annotate with __init	2014-01-05 20:27:54 -05:00
net-traces.c	net: IPv6 fib lookup tracepoint	2015-11-22 11:54:10 -05:00
netclassid_cgroup.c	core: remove unneded headers for net cgroup controllers.	2016-02-17 15:31:27 -05:00
netevent.c	netevent: remove automatic variable in register_netevent_notifier()	2015-05-31 00:03:21 -07:00
netpoll.c	netpoll: Drop budget parameter from NAPI polling call hierarchy	2015-09-29 14:57:16 -07:00
netprio_cgroup.c	core: remove unneded headers for net cgroup controllers.	2016-02-17 15:31:27 -05:00
pktgen.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-01-11 23:55:43 -05:00
ptp_classifier.c	ptp: Change ptp_class to a proper bitmask	2015-11-03 11:08:22 -05:00
request_sock.c	tcp: restore fastopen operations	2015-10-05 03:19:06 -07:00
rtnetlink.c	net: Add support for filtering link dump by master device and kind	2016-02-11 04:18:26 -05:00
scm.c	unix: correctly track in-flight fds in sending process user_struct	2016-02-08 10:30:42 -05:00
secure_seq.c	net: remove a sparse error in secure_dccpv6_sequence_number()	2015-05-25 22:55:37 -04:00
skbuff.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
sock_diag.c	net: diag: Add the ability to destroy a socket.	2015-12-15 23:26:51 -05:00
sock_reuseport.c	soreuseport: fix NULL ptr dereference SO_REUSEPORT after bind	2016-01-19 14:44:23 -05:00
sock.c	soreuseport: Prep for fast reuseport TCP socket selection	2016-02-11 03:54:15 -05:00
stream.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
sysctl_net_core.c	net:Add sysctl_max_skb_frags	2016-02-09 04:28:06 -05:00
timestamping.c	net: skb_defer_rx_timestamp should check for phydev before setting up classify	2015-07-09 14:17:15 -07:00
tso.c	net: tso: add support for IPv6	2015-10-26 22:24:22 -07:00
utils.c	net: move net_get_random_once to lib	2015-10-08 05:26:35 -07:00