Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/raw.c
  3632679d9e4f ("ipv{4,6}/raw: fix output xfrm lookup wrt protocol")
  c85be08fc4fa ("raw: Stop using RTO_ONLINK.")
https://lore.kernel.org/all/20230525110037.2b532b83@canb.auug.org.au/

Adjacent changes:

drivers/net/ethernet/freescale/fec_main.c
  9025944fddfe ("net: fec: add dma_wmb to ensure correct descriptor values")
  144470c88c5d ("net: fec: using the standard return codes when xdp xmit errors")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/microchip/lan966x/lan966x_main.c
Simple merge

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

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

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

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

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

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

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/raw.c
index 8b7b5c842bdd59af08b4968e9825f5683c0337ae,eadf1c9ef7e493e5466cfef2fb1f83df7bb088f5..9aacce9db7b927a44040a92fae1da7d30623c3e7
--- 1/net/ipv4/raw.c
--- 2/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@@ -596,8 -600,9 +599,8 @@@ static int raw_sendmsg(struct sock *sk
                }
        }
  
 -      flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos,
 -                         RT_SCOPE_UNIVERSE,
 +      flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos, scope,
-                          hdrincl ? IPPROTO_RAW : sk->sk_protocol,
+                          hdrincl ? ipc.protocol : sk->sk_protocol,
                           inet_sk_flowi_flags(sk) |
                            (hdrincl ? FLOWI_FLAG_KNOWN_NH : 0),
                           daddr, saddr, 0, 0, sk->sk_uid);

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

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

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

diff --cc net/tls/tls_device.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge