projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4ff3dfc 714069d)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 1 Jun 2023 22:33:03 +0000 (15:33 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 1 Jun 2023 22:38:26 +0000 (15:38 -0700)
commita03a91bd68cb00c615e602cf605e6be12bedaa90
treed26ef8bf5538d777498d6ef0fc6e4cc69475415btree | snapshot
parent4ff3dfc91c8458f65366f283167d1cd6f16be06fcommit | diff
parent714069daa5d345483578e2ff77fb6f06f4dcba6acommit | diff
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/sfc/tc.c
  622ab656344a ("sfc: fix error unwinds in TC offload")
  b6583d5e9e94 ("sfc: support TC decap rules matching on enc_src_port")

net/mptcp/protocol.c
  5b825727d087 ("mptcp: add annotations around msk->subflow accesses")
  e76c8ef5cc5b ("mptcp: refactor mptcp_stream_accept()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
12 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/tc.c diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
net/ipv4/af_inet.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_timer.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/sched/cls_flower.c diff1 | diff2 | blob | history
tools/net/ynl/lib/ynl.py diff1 | diff2 | blob | history
tools/testing/selftests/net/mptcp/mptcp_join.sh diff1 | diff2 | blob | history
Domain: System / Kernel;