From: Jakub Kicinski 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: v5.16-rc1~159^2~381 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fcd14d0f78090f57aecd7f424e2b0373cd631a7;p=thirdparty%2Flinux.git 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 --- 2fcd14d0f78090f57aecd7f424e2b0373cd631a7