Jakub Kicinski b6df00789e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Trivial conflict in net/netfilter/nf_tables_api.c.

Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.

skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2021-06-29 15:45:27 -07:00

..

mana

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2021-06-29 15:45:27 -07:00

Kconfig

net: mana: fix PCI_HYPERV dependency

2021-04-22 13:22:28 -07:00

Makefile

net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)

2021-04-19 15:24:25 -07:00