git.kernel.dk Git - linux-block.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 5 Oct 2023 20:16:31 +0000 (13:16 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 5 Oct 2023 20:16:47 +0000 (13:16 -0700)
commit	2606cf059c56bfb86d5d6bd0f41bd7eedefc8b0a
tree	6bd918ad4fc55e677cc6ccb3212eab873c467c7f	tree \| snapshot
parent	49e7265fd098fdade2bbdd9331e6b914cda7fa83	commit \| diff
parent	f291209eca5eba0b4704fa0832af57b12dbc1a02	commit \| diff

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

Cross-merge networking fixes after downstream PR.

No conflicts (or adjacent changes of note).

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

26 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/s390/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_virtchnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/rswitch.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_prueth.c	diff1 \|	diff2 \|	blob \| history
drivers/ptp/ptp_ocp.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/kasan.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_fib.h	diff1 \|	diff2 \|	blob \| history
include/net/mana/mana.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/memalloc.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
mm/kasan/kasan.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip6.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_sync.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/s390/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_virtchnl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/rswitch.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_prueth.c	diff1 \|	diff2 \|	blob \| history
drivers/ptp/ptp_ocp.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/kasan.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_fib.h	diff1 \|	diff2 \|	blob \| history
include/net/mana/mana.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/memalloc.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
mm/kasan/kasan.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip6.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_sync.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history