David S. Miller f8ddadc4db Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... There were quite a few overlapping sets of changes here. Daniel's bug fix for off-by-ones in the new BPF branch instructions, along with the added allowances for "data_end > ptr + x" forms collided with the metadata additions. Along with those three changes came veritifer test cases, which in their final form I tried to group together properly. If I had just trimmed GIT's conflict tags as-is, this would have split up the meta tests unnecessarily. In the socketmap code, a set of preemption disabling changes overlapped with the rename of bpf_compute_data_end() to bpf_compute_data_pointers(). Changes were made to the mv88e6060.c driver set addr method which got removed in net-next. The hyperv transport socket layer had a locking change in 'net' which overlapped with a change of socket state macro usage in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-22 13:39:14 +01:00
..
datagram.c	datagram: Remove redundant unlikely()	2017-09-26 09:54:06 -07:00
dev_addr_lists.c
dev_ioctl.c	dev_ioctl: add missing NETDEV_CHANGE_TX_QUEUE_LEN event notification	2017-10-16 21:23:10 +01:00
dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
devlink.c	devlink: Add IPv6 header for dpipe	2017-08-31 14:42:19 -07:00
drop_monitor.c	drop_monitor: use setup_timer	2017-03-12 23:47:16 -07:00
dst_cache.c	net: dst_cache_per_cpu_dst_set() can be static	2016-03-18 17:45:08 -04:00
dst.c	net: dst: move cpu inside ifdef to avoid compilation warning	2017-10-10 15:55:58 -07:00
ethtool.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
fib_notifier.c	net: Add module reference to FIB notifiers	2017-09-01 20:33:42 -07:00
fib_rules.c	rtnetlink: make rtnl_register accept a flags parameter	2017-08-09 16:57:38 -07:00
filter.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
flow_dissector.c	flow_dissector: dissect tunnel info	2017-10-02 11:06:07 -07:00
gen_estimator.c	net_sched: gen_estimator: fix scaling error in bytes/packets samples	2017-09-13 13:30:53 -07:00
gen_stats.c	net_sched: gen_estimator: complete rewrite of rate estimators	2016-12-05 15:21:59 -05:00
gro_cells.c	net: Generic XDP	2017-04-25 13:33:49 -04:00
hwbm.c	net: hwbm: Fix unbalanced spinlock in error case	2016-05-25 12:35:09 -07:00
link_watch.c
lwt_bpf.c	bpf: rename bpf_compute_data_end into bpf_compute_data_pointers	2017-09-26 13:36:44 -07:00
lwtunnel.c	ipv6: sr: define core operations for seg6local lightweight tunnel	2017-08-07 14:16:22 -07:00
Makefile	net: core: Make the FIB notification chain generic	2017-08-03 15:35:59 -07:00
neighbour.c	neigh: make strucrt neigh_table::entry_size unsigned int	2017-09-25 20:36:17 -07:00
net_namespace.c	net: call newid/getid without rtnl mutex held	2017-08-09 16:57:38 -07:00
net-procfs.c	net-procfs: Use vsnprintf extension %phN	2017-06-04 19:52:58 -04:00
net-sysfs.c	net: core: decouple ifalias get/set from rtnl lock	2017-10-03 15:56:01 -07:00
net-sysfs.h
net-traces.c	tcp: add a tracepoint for tcp retransmission	2017-10-14 18:45:15 -07:00
netclassid_cgroup.c	cgroup: add @flags to css_task_iter_start() and implement CSS_TASK_ITER_PROCS	2017-07-21 11:14:51 -04:00
netevent.c
netpoll.c	netpoll: Fix device name check in netpoll_setup()	2017-07-26 17:01:43 -07:00
netprio_cgroup.c	net: break include loop netdevice.h, dsa.h, devlink.h	2017-03-28 22:46:04 -07:00
pktgen.c	net: convert sk_buff.users from atomic_t to refcount_t	2017-07-01 07:39:07 -07:00
ptp_classifier.c	ptp: Change ptp_class to a proper bitmask	2015-11-03 11:08:22 -05:00
request_sock.c	ipv4: Namespaceify tcp_max_syn_backlog knob	2016-12-29 11:38:31 -05:00
rtnetlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
scm.c	sched/headers: Prepare for new header dependencies before moving code to <linux/sched/user.h>	2017-03-02 08:42:29 +01:00
secure_seq.c	tcp: Namespaceify sysctl_tcp_timestamps	2017-06-08 10:53:29 -04:00
skbuff.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
sock_diag.c	netlink: extended ACK reporting	2017-04-13 13:58:20 -04:00
sock_reuseport.c	soreuseport: fix initialization race	2017-10-22 02:03:51 +01:00
sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-22 13:39:14 +01:00
stream.c	sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>	2017-03-02 08:42:29 +01:00
sysctl_net_core.c	net: move somaxconn init from sysctl code	2017-05-25 13:12:17 -04:00
timestamping.c
tso.c
utils.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-05-02 16:40:27 -07:00