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
..
core	RDMA/core: Fix double destruction of uobject	2020-05-27 14:22:57 -03:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
sw	tcp: add tcp_sock_set_nodelay	2020-05-28 11:11:45 -07:00
ulp	IB/ipoib: Fix double free of skb in case of multicast traffic in CM mode	2020-05-27 21:14:09 -03:00
Kconfig	RDMA/iw_cxgb3: Remove the iw_cxgb3 module from kernel	2019-10-04 15:08:59 -03:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00