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

Conflicts:

drivers/net/ethernet/stmicro/stmmac/dwmac5.c
drivers/net/ethernet/stmicro/stmmac/dwmac5.h
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
drivers/net/ethernet/stmicro/stmmac/hwif.h
  37e4b8df ("net: stmmac: fix FPE events losing")
  c3f3b972 ("net: stmmac: Refactor EST implementation")
https://lore.kernel.org/all/20231206110306.01e91114@canb.auug.org.au/



Adjacent changes:

net/ipv4/tcp_ao.c
  9396c4ee ("net/tcp: Don't store TCP-AO maclen on reqsk")
  7b0f570f ("tcp: Move TCP-AO bits from cookie_v[46]_check() to tcp_ao_syncookie().")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 87e839c8 5e3f5b81
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