git.kernel.dk Git - linux-2.6-block.git/commit

Merge git://git./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>

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 8 Aug 2024 21:03:51 +0000 (14:03 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 29 Aug 2024 18:49:10 +0000 (11:49 -0700)
commit	3cbd2090d334eb4456db0005f7b76adb3b6fd8db
tree	166ee75806c4b2570fc5a6f891bee1ea18b7f975	tree
parent	bf4d87f884fe8a4b6b61fe4d0e05f293d08df61c	commit \| diff
parent	0dd5dd63ba91d7bee9d0fbc2a6dc73e595391b4c	commit \| diff

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/faraday/ftgmac100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/icssg/icssg_prueth.c	diff1 \|	diff2 \|	blob \| history
include/net/busy_poll.h	diff1 \|	diff2 \|	blob \| history
net/core/pktgen.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/ioctl.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.h	diff1 \|	diff2 \|	blob \| history