Commit 2ee738e9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR (net-6.13-rc8).

Conflicts:

drivers/net/ethernet/realtek/r8169_main.c
  1f691a1f ("r8169: remove redundant hwmon support")
  152d00a9 ("r8169: simplify setting hwmon attribute visibility")
https://lore.kernel.org/20250115122152.760b4e8d@canb.auug.org.au



Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  152f4da0 ("bnxt_en: add support for rx-copybreak ethtool command")
  f0aa6a37 ("eth: bnxt: always recalculate features after XDP clearing, fix null-deref")

drivers/net/ethernet/intel/ice/ice_type.h
  50327223 ("ice: add lock to protect low latency interface")
  dc26548d ("ice: Fix quad registers read on E825")

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