gitweb.dragonflybsd.org Git - linux.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 23 Sep 2021 18:19:49 +0000 (11:19 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 23 Sep 2021 18:19:49 +0000 (11:19 -0700)
commit	2fcd14d0f78090f57aecd7f424e2b0373cd631a7
tree	f8946c307a3b5d319c17ec988d8a38c0fe7a08de	tree \| snapshot
parent	9aad3e4ede9bebda23579f674420123dacb61fda	commit \| diff
parent	9bc62afe03afdf33904f5e784e1ad68c50ff00bb	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

net/mptcp/protocol.c
977d293e23b4 ("mptcp: ensure tx skbs always have the MPTCP ext")
efe686ffce01 ("mptcp: ensure tx skbs always have the MPTCP ext")

same patch merged in both trees, keep net-next.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

13 files changed:

Linux Project Source (from git://github.com/torvalds/linux)

RSS Atom

drivers/net/dsa/b53/b53_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/bcm_sf2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/sja1105/sja1105_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/sja1105/sja1105_vl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/enetc/enetc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa2.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_clc.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_core.c	diff1 \|	diff2 \|	blob \| history