Merge git://git.kernel.org/pub/scm/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>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_virtchnl.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/renesas/rswitch.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Simple merge

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.c
Simple merge

diff --cc drivers/ptp/ptp_ocp.c
Simple merge

diff --cc include/linux/bpf.h
Simple merge

diff --cc include/linux/kasan.h
Simple merge

diff --cc include/net/ip_fib.h
index 84b0a82c9df4214eb87dd2530f53e3a00acf47df,15de07d36540526fd4ede91f77af17eaf9ea1a45..d4667b7797e3e4591f3ff1fe641f168295e0a894
--- 1/include/net/ip_fib.h
--- 2/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@@ -154,9 -154,10 +154,10 @@@ struct fib_info 
        int                     fib_nhs;
        bool                    fib_nh_is_v6;
        bool                    nh_updated;
+       bool                    pfsrc_removed;
        struct nexthop          *nh;
        struct rcu_head         rcu;
 -      struct fib_nh           fib_nh[];
 +      struct fib_nh           fib_nh[] __counted_by(fib_nhs);
  };
  
  

diff --cc include/net/mana/mana.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc kernel/bpf/memalloc.c
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc mm/kasan/kasan.h
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/l2tp/l2tp_ip6.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_sync.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge