git.maquefel.me Git - linux.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 1 Feb 2024 22:33:26 +0000 (14:33 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 1 Feb 2024 23:12:37 +0000 (15:12 -0800)
commit	cf244463a286ea57ea7e63c33614d302f776e62e
tree	caa068596cbfea621376822e30ab545c6516b2c7	tree \| snapshot
parent	cacfd6bfc381ce0e71dfb4ab902ca0fb0e1abe0f	commit \| diff
parent	41b9fb381a486360b2daaec0c7480f8e3ff72bc7	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

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

13 files changed:

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mt7530.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/google/gve/gve_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/lsm_hook_defs.h	diff1 \|	diff2 \|	blob \| history
include/net/af_unix.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/unix/diag.c	diff1 \|	diff2 \|	blob \| history
security/security.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/forwarding/Makefile	diff1 \|	diff2 \|	blob \| history