David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Two minor conflicts: 1) net/ipv4/route.c, adding a new local variable while moving another local variable and removing it's initial assignment. 2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes. One pretty prints the port mode differently, whilst another changes the driver to try and obtain the port mode from the port node rather than the switch node. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-09-22 16:45:34 -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-09-22 16:45:34 -07:00
xdp_umem.h	xsk: Move xsk_tx_list and its lock to buffer pool	2020-08-31 21:15:04 +02:00
xsk_buff_pool.c	xsk: Add shared umem support between queue ids	2020-08-31 21:15:04 +02:00
xsk_diag.c	xsk: Move queue_id, dev and need_wakeup to buffer pool	2020-08-31 21:15:04 +02: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: Create and free buffer pool independently from umem	2020-08-31 21:15:04 +02:00
xsk.c	xsk: Add shared umem support between devices	2020-08-31 21:15:04 +02:00
xsk.h	xsk: Move queue_id, dev and need_wakeup to buffer pool	2020-08-31 21:15:04 +02:00
xskmap.c	bpf: Relax max_entries check for most of the inner map types	2020-08-28 15:41:30 +02:00