David S. Miller 71930d6102 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... All conflicts seemed rather trivial, with some guidance from Saeed Mameed on the tc_ct.c one. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-07-11 00:46:00 -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	mmap locking API: use coccinelle to convert mmap_sem rwsem call sites	2020-06-09 09:39:14 -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: Use dma_need_sync instead of reimplenting it	2020-06-30 15:44:03 +02: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	xdp: Fix xsk_generic_xmit errno	2020-06-11 23:44:33 +02: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	bpf: Set map_btf_{name, id} for all map types	2020-06-22 22:22:58 +02:00