Merge git://git.kernel.org/pub/scm/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>

diff --cc drivers/net/dsa/b53/b53_priv.h
Simple merge

diff --cc drivers/net/dsa/bcm_sf2.c
Simple merge

diff --cc drivers/net/dsa/sja1105/sja1105_main.c
Simple merge

diff --cc drivers/net/dsa/sja1105/sja1105_vl.c
Simple merge

diff --cc drivers/net/ethernet/freescale/enetc/enetc.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/dsa/dsa2.c
Simple merge

diff --cc net/smc/smc_clc.c
Simple merge

diff --cc net/smc/smc_core.c
Simple merge