git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	49c9d9c0b225db51771f7834b5343339a8ff4495
tree	f8946c307a3b5d319c17ec988d8a38c0fe7a08de	tree \| snapshot
parent	10b4d669a4121fcea5019bf5143993c1aedc15c8	commit \| diff
parent	918843b112c1a3be912e192919629ab7294f950e	commit \| diff

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

net/mptcp/protocol.c
18599fb1d7c9 ("mptcp: ensure tx skbs always have the MPTCP ext")
b247e4cc7c9c ("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 Kernel Source Tree.

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