diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-12-08 02:47:58 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-12-08 02:53:17 +0100 |
| commit | 2483e7f04ce0e97c69b27d28ebce7a2320b7a7a6 (patch) | |
| tree | a45d2e6897a32eaee4b6a5b3b84617d5ca52f4b2 /crypto/proc.c | |
| parent | net: wangxun: fix changing mac failed when running (diff) | |
| parent | Merge tag 'net-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-2483e7f04ce0e97c69b27d28ebce7a2320b7a7a6.tar.xz linux-2483e7f04ce0e97c69b27d28ebce7a2320b7a7a6.zip | |
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>
Diffstat (limited to 'crypto/proc.c')
0 files changed, 0 insertions, 0 deletions