diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-09-23 11:19:49 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-23 11:19:49 -0700 |
| commit | 2fcd14d0f78090f57aecd7f424e2b0373cd631a7 (patch) | |
| tree | f8946c307a3b5d319c17ec988d8a38c0fe7a08de /include/linux/debugobjects.h | |
| parent | net: dsa: sja1105: stop using priv->vlan_aware (diff) | |
| parent | Merge tag 'net-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-dev-2fcd14d0f78090f57aecd7f424e2b0373cd631a7.tar.xz linux-dev-2fcd14d0f78090f57aecd7f424e2b0373cd631a7.zip | |
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>
Diffstat (limited to 'include/linux/debugobjects.h')
0 files changed, 0 insertions, 0 deletions