David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Lots of overlapping changes, mostly trivial in nature. The mlxsw conflict was resolving using the example resolution at: https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-05 13:04:31 -07:00
..
Kconfig
Makefile	xsk: remove newline at end of file	2018-05-18 16:07:02 +02:00
xdp_umem_props.h	xsk: new descriptor addressing scheme	2018-06-04 17:21:02 +02:00
xdp_umem.c	xsk: don't allow umem replace at stack level	2018-07-31 09:48:21 -07:00
xdp_umem.h	xsk: wire upp Tx zero-copy functions	2018-06-05 15:48:34 +02:00
xsk_queue.c	xsk: new descriptor addressing scheme	2018-06-04 17:21:02 +02:00
xsk_queue.h	xsk: fix poll/POLLIN premature returns	2018-07-26 02:53:10 +02:00
xsk.c	net: xsk: don't return frames via the allocator on error	2018-07-31 02:03:19 +02:00