diff options
| author | Jakub Kicinski <[email protected]> | 2024-08-08 14:03:51 -0700 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-08-29 11:49:10 -0700 |
| commit | 3cbd2090d334eb4456db0005f7b76adb3b6fd8db (patch) | |
| tree | 166ee75806c4b2570fc5a6f891bee1ea18b7f975 /lib/test_bits.c | |
| parent | bf4d87f884fe8a4b6b61fe4d0e05f293d08df61c (diff) | |
| parent | 0dd5dd63ba91d7bee9d0fbc2a6dc73e595391b4c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/ethernet/faraday/ftgmac100.c
4186c8d9e6af ("net: ftgmac100: Ensure tx descriptor updates are visible")
e24a6c874601 ("net: ftgmac100: Get link speed and duplex for NC-SI")
https://lore.kernel.org/[email protected]
net/ipv4/tcp.c
bac76cf89816 ("tcp: fix forever orphan socket caused by tcp_abort")
edefba66d929 ("tcp: rstreason: introduce SK_RST_REASON_TCP_STATE for active reset")
https://lore.kernel.org/[email protected]
No adjacent changes.
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'lib/test_bits.c')
0 files changed, 0 insertions, 0 deletions