]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 23 Sep 2021 18:19:49 +0000 (11:19 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 23 Sep 2021 18:19:49 +0000 (11:19 -0700)
commit229e93f00a16a21467575e51ba800ea195e32cbf
treef8946c307a3b5d319c17ec988d8a38c0fe7a08de
parent4fd33bb7323eaa4900333f0a3066fcc902a720cc
parent393b1c60d8e3f0b1217144b54fbd26aea870b0d4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

net/mptcp/protocol.c
  d08279d72070 ("mptcp: ensure tx skbs always have the MPTCP ext")
  0cc1db0a8f34 ("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:
drivers/net/dsa/b53/b53_priv.h
drivers/net/dsa/bcm_sf2.c
drivers/net/dsa/sja1105/sja1105_main.c
drivers/net/dsa/sja1105/sja1105_vl.c
drivers/net/ethernet/freescale/enetc/enetc.c
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
drivers/net/virtio_net.c
include/net/sock.h
kernel/events/core.c
net/core/dev.c
net/dsa/dsa2.c
net/smc/smc_clc.c
net/smc/smc_core.c