David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -08:00
..
Kconfig	xsk: add sock_diag interface for AF_XDP	2019-01-25 01:50:03 +01:00
Makefile	xsk: add sock_diag interface for AF_XDP	2019-01-25 01:50:03 +01:00
xdp_umem.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-20 00:34:07 -08:00
xdp_umem.h	xsk: fix bug when trying to use both copy and zero-copy on one queue id	2018-10-05 09:31:00 +02:00
xsk_diag.c	xsk: add sock_diag interface for AF_XDP	2019-01-25 01:50:03 +01:00
xsk_queue.c	net: xsk: add a simple buffer reuse queue	2018-09-25 13:13:15 -07:00
xsk_queue.h	net: xsk: add a simple buffer reuse queue	2018-09-25 13:13:15 -07:00
xsk.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-24 12:06:19 -08:00
xsk.h	xsk: add sock_diag interface for AF_XDP	2019-01-25 01:50:03 +01:00