From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 23 Sep 2021 18:19:49 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: block-5.16-2021-11-13~96^2~381
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2fcd14d0f78090f57aecd7f424e2b0373cd631a7;p=linux-block.git

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>
---

2fcd14d0f78090f57aecd7f424e2b0373cd631a7