Jakub Kicinski 8859a44ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: MAINTAINERS - keep Chandrasekar drivers/net/ethernet/mellanox/mlx5/core/en_main.c - simple fix + trust the code re-added to param.c in -next is fine include/linux/bpf.h - trivial include/linux/ethtool.h - trivial, fix kdoc while at it include/linux/skmsg.h - move to relevant place in tcp.c, comment re-wrapped net/core/skmsg.c - add the sk = sk // sk = NULL around calls net/tipc/crypto.c - trivial Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-04-09 20:48:35 -07:00
..
core	RDMA/addr: Be strict with gid size	2021-04-08 16:14:56 -03:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-04-09 20:48:35 -07:00
sw	RDMA/rxe: Fix errant WARN_ONCE in rxe_completer()	2021-03-05 14:15:22 -04:00
ulp	RDMA/rtrs-clt: Close rtrs client conn before destroying rtrs clt session files	2021-04-01 15:41:05 -03:00
Kconfig	RDMA/umem: Support importing dma-buf as user memory region	2021-01-20 16:07:52 -04:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00