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	net: qrtr: Do not depend on ARCH_QCOM	2020-05-07 13:21:12 -07:00
Makefile	net: qrtr: Add MHI transport layer	2020-05-07 13:21:12 -07:00
mhi.c	net: qrtr: Add MHI transport layer	2020-05-07 13:21:12 -07:00
ns.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
qrtr.c	net: qrtr: Fix passing invalid reference to qrtr_local_enqueue()	2020-05-21 17:04:53 -07:00
qrtr.h	net: qrtr: Fix FIXME related to qrtr_ns_init()	2020-03-03 17:52:21 -08:00
smd.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 284	2019-06-05 17:36:37 +02:00
tun.c	net: qrtr: Simplify 'qrtr_tun_release()'	2019-10-30 17:58:23 -07:00