linux-sg2042/drivers/net/xen-netback
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
..
Makefile xen-netback: separate guest side rx code into separate module 2016-10-06 20:37:35 -04:00
common.h net/xen-netback: Convert timers to use timer_setup() 2017-10-18 12:40:27 +01:00
hash.c xen-netback: Use GFP_ATOMIC to allocate hash 2017-03-02 14:44:22 -08:00
interface.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-10-22 13:39:14 +01:00
netback.c net/xen-netback: Convert timers to use timer_setup() 2017-10-18 12:40:27 +01:00
rx.c xen-netback: fix type mismatch warning 2016-10-13 11:02:25 -04:00
xenbus.c xen-netback: fix race condition on XenBus disconnect 2017-03-12 23:44:43 -07:00