* [MPTCP] Re: [GIT] Sync with net-next on 20200313: conflicts
@ 2020-03-13 17:50 Paolo Abeni
0 siblings, 0 replies; only message in thread
From: Paolo Abeni @ 2020-03-13 17:50 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
On Fri, 2020-03-13 at 18:46 +0100, Matthieu Baerts wrote:
> Hello,
>
> Recently, one MPTCP-related patch from Davide has been applied in
> 'net-next' repo:
>
> - 767d3ded5fb8 (net: mptcp: don't hang before sending 'MP capable with
> data')
>
> This created conflicts:
>
> - 21a8666f4683: conflict in t/mptcp-Add-path-manager-interface
> - c1aa2cd27a83: conflict in
> t/mptcp-update-per-unacked-sequence-on-pkt-reception
>
> I hope they have been resolved as expected.
>
> Tests are all green and the "export" branch has been updated.
Yep, conflicts resolution LGTM.
Thanks,
Paolo
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-03-13 17:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-13 17:50 [MPTCP] Re: [GIT] Sync with net-next on 20200313: conflicts Paolo Abeni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.