David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	xsk: Introduce AF_XDP buffer allocation API	2020-05-21 17:31:26 -07:00
xdp_umem.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
xdp_umem.h	xsk: Move driver interface to xdp_sock_drv.h	2020-05-21 17:31:26 -07:00
xsk_buff_pool.c	xsk: Explicitly inline functions and move definitions	2020-05-21 17:31:27 -07:00
xsk_diag.c	xsk: Introduce AF_XDP buffer allocation API	2020-05-21 17:31:26 -07:00
xsk_queue.c	xsk: Remove MEM_TYPE_ZERO_COPY and corresponding code	2020-05-21 17:31:27 -07:00
xsk_queue.h	xsk: Explicitly inline functions and move definitions	2020-05-21 17:31:27 -07:00
xsk.c	xsk: Explicitly inline functions and move definitions	2020-05-21 17:31:27 -07:00
xsk.h	xsk: Move defines only used by AF_XDP internals to xsk.h	2020-05-21 17:31:26 -07:00
xskmap.c	xsk: Move xskmap.c to net/xdp/	2020-05-21 17:31:26 -07:00