Skip to content
Commit e63c1822 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  e009b2ef ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()")
  0f2b2147 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL")
https://lore.kernel.org/all/20240105115509.225aa8a2@canb.auug.org.au/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a180b0b1 1f874787
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