* [MPTCP] [GIT] Sync with net-next on 20200316: conflicts
@ 2020-03-16 15:58 Matthieu Baerts
0 siblings, 0 replies; only message in thread
From: Matthieu Baerts @ 2020-03-16 15:58 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 1010 bytes --]
Hello,
Recently, MPTCP-related patches from Paolo have been applied in
'net-next' repo:
- 58b09919626b (mptcp: create msk early)
- dc093db5cc05 (mptcp: drop unneeded checks)
This created conflicts:
- cf1a8046cf64: conflict in t/mptcp-Add-path-manager-interface
- 09497b43baab: conflict in
t/mptcp-Add-handling-of-incoming-MP_JOIN-requests
- 08b1bc302164: conflict in
t/mptcp-Add-handling-of-incoming-MP_JOIN-requests - part 2
- 5d58ead3f82c: conflict in
t/mptcp-Add-handling-of-outgoing-MP_JOIN-requests
- 2737f5aa7672: conflict in
t/mptcp-update-per-unacked-sequence-on-pkt-reception
- 2d24b3dc7d8a: conflict in t/mptcp-increment-MIB-counters-in-a-few-places
I hope they have been resolved as expected.
Tests are in progress. The "export" branch will be updated after the tests.
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-03-16 15:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-16 15:58 [MPTCP] [GIT] Sync with net-next on 20200316: conflicts Matthieu Baerts
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.