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


Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/pensando/ionic/ionic_txrx.c
  d9c04209 ("ionic: Mark error paths in the data path as unlikely")
  491aee89 ("ionic: fix kernel panic in XDP_TX action")

net/ipv6/ip6_fib.c
  b4cb4a13 ("net: use unrcu_pointer() helper")
  b01e1c03 ("ipv6: fix possible race in __fib6_drop_pcpu_from()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 74933281 d30d0e49
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment