Jakub Kicinski adc2e56ebe Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflicts in net/can/isotp.c and tools/testing/selftests/net/mptcp/mptcp_connect.sh scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c to include/linux/ptp_clock_kernel.h in -next so re-apply the fix there. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-06-18 19:47:02 -07:00
..
core	RDMA: Verify port when creating flow rule	2021-06-10 08:59:33 -03:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-06-18 19:47:02 -07:00
sw	RDMA/rxe: Return CQE error if invalid lkey was supplied	2021-05-17 13:52:47 -03:00
ulp	RDMA/ipoib: Fix warning caused by destroying non-initial netns	2021-06-02 15:20:39 -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