Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 26 May 2023 02:56:10 +0000 (19:56 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 26 May 2023 02:57:39 +0000 (19:57 -0700)
commitd4031ec844bc52fe7f2f844e9c476727fd6b8240
treeb350f90348c94ccd6e6d5dcd31ad371e3486e177
parent657d42cf5df64d9f32caab73ba2d2284879a37b0
parentad42a35bdfc6d3c0fc4cb4027d7b2757ce665665
Merge git://git./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>
20 files changed:
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/microchip/lan966x/lan966x_main.c
include/linux/skbuff.h
include/net/bonding.h
include/net/ip.h
include/net/tcp.h
include/net/tls.h
kernel/bpf/verifier.c
net/core/skbuff.c
net/ipv4/raw.c
net/ipv4/tcp.c
net/ipv4/tcp_bpf.c
net/ipv4/udp.c
net/tls/tls_device.c
net/unix/af_unix.c