| commit | 2fcd14d0f78090f57aecd7f424e2b0373cd631a7 | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Thu Sep 23 11:19:49 2021 -0700 |
| committer | Jakub Kicinski <kuba@kernel.org> | Thu Sep 23 11:19:49 2021 -0700 |
| tree | f8946c307a3b5d319c17ec988d8a38c0fe7a08de | |
| parent | 9aad3e4ede9bebda23579f674420123dacb61fda [diff] | |
| parent | 9bc62afe03afdf33904f5e784e1ad68c50ff00bb [diff] |
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>