Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 1 Feb 2024 22:33:26 +0000 (14:33 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 1 Feb 2024 23:12:37 +0000 (15:12 -0800)
Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
13 files changed:
1  2 
MAINTAINERS
drivers/net/dsa/mt7530.c
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/ethernet/google/gve/gve_rx.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
include/linux/lsm_hook_defs.h
include/net/af_unix.h
include/net/netfilter/nf_tables.h
net/netfilter/nf_tables_api.c
net/unix/af_unix.c
net/unix/diag.c
security/security.c
tools/testing/selftests/net/forwarding/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/unix/diag.c
Simple merge
Simple merge