David S. Miller 2e2d6f0342 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/sched/cls_api.c has overlapping changes to a call to nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL to the 5th argument, and another (from 'net-next') added cb->extack instead of NULL to the 6th argument. net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to code which moved (to mr_table_dump)) in 'net-next'. Thanks to David Ahern for the heads up. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-19 11:03:06 -07:00
..
Kconfig	net: initial AF_XDP skeleton	2018-05-03 15:55:23 -07:00
Makefile	xsk: remove newline at end of file	2018-05-18 16:07:02 +02:00
xdp_umem.c	xsk: proper AF_XDP socket teardown ordering	2018-10-08 10:09:22 +02: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_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	2018-10-19 11:03:06 -07:00