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


Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/intel/igc/igc_main.c
  06b41258 ("igc: Add lock to safeguard global Qbv variables")
  d3750076 ("igc: Add TransmissionOverrun counter")

drivers/net/ethernet/microsoft/mana/mana_en.c
  a7dfeda6 ("net: mana: Fix MANA VF unload when hardware is unresponsive")
  a9ca9f9c ("page_pool: split types and declarations from page_pool.h")
  92272ec4 ("eth: add missing xdp.h includes in drivers")

net/mptcp/protocol.h
  511b90e3 ("mptcp: fix disconnect vs accept race")
  b8dc6d6c ("mptcp: fix rcv buffer auto-tuning")

tools/testing/selftests/net/mptcp/mptcp_join.sh
  c8c101ae ("selftests: mptcp: join: fix 'implicit EP' test")
  03668c65 ("selftests: mptcp: join: rework detailed report")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 29afcd69 25aa0beb
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