Skip to content
Commit d4031ec8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/raw.c
  3632679d ("ipv{4,6}/raw: fix output xfrm lookup wrt protocol")
  c85be08f ("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
  9025944f ("net: fec: add dma_wmb to ensure correct descriptor values")
  144470c8 ("net: fec: using the standard return codes when xdp xmit errors")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 657d42cf ad42a35b
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment