mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 16:41:58 +00:00
b6df00789e
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> |
||
|---|---|---|
| .. | ||
| address-claim.c | ||
| bus.c | ||
| j1939-priv.h | ||
| Kconfig | ||
| main.c | ||
| Makefile | ||
| socket.c | ||
| transport.c | ||