linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 15:19:51 +00:00

History

Jakub Kicinski 3cbd2090d3 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/0b851ec5-f91d-4dd3-99da-e81b98c9ed28@kernel.org

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/20240828112207.5c199d41@canb.auug.org.au

No adjacent changes.

Link: https://patch.msgid.link/20240829130829.39148-1-pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-08-29 11:49:10 -07:00

fdp

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

2023-06-22 18:40:38 -07:00

microread

nfc: Drop explicit initialization of struct i2c_device_id::driver_data to 0

2024-06-20 19:28:31 -07:00

nfcmrvl

nfc: Drop explicit initialization of struct i2c_device_id::driver_data to 0

2024-06-20 19:28:31 -07:00

nxp-nci

nfc: Drop explicit initialization of struct i2c_device_id::driver_data to 0