linux

iv/linux

History

Jakub Kicinski 2483e7f04c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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
  37e4b8df27bc ("net: stmmac: fix FPE events losing")
  c3f3b97238f6 ("net: stmmac: Refactor EST implementation")
https://lore.kernel.org/all/20231206110306.01e91114@canb.auug.org.au/

Adjacent changes:

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2023-12-07 17:53:17 -08:00

cgroup-internal.h

cgroup: Add a new helper for cgroup1 hierarchy

2023-11-09 13:25:47 -10:00

cgroup-v1.c

cgroup: Add a new helper for cgroup1 hierarchy

2023-11-09 13:25:47 -10:00

cgroup.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2023-11-23 12:20:58 -08:00

cpuset.c

cgroup/cpuset: Cleanup signedness issue in cpu_exclusive_check()