v9:
 - drop patch 1-3 in v8, they are accepted.
 - drop patch 6 in v8.
 - add a new patch "move the declarations of ssk and subflow" to avoid
   the compiling errors when moving the mp_fail label.
 - update patch "reduce branching when writing MP_FAIL option" as Mat
   suggested.
 - Change 'ADD+RM' from 'C' to 'P' in patch "clarify when options can
   be used".

Geliang Tang (3):
  mptcp: move the declarations of ssk and subflow
  mptcp: print out reset infos of MP_RST
  selftests: mptcp: add mp_fail testcases

Matthieu Baerts (2):
  mptcp: reduce branching when writing MP_FAIL option
  mptcp: clarify when options can be used

 net/mptcp/options.c                           |  64 +++++++---
 tools/testing/selftests/net/mptcp/config      |   5 +
 .../testing/selftests/net/mptcp/mptcp_join.sh | 111 ++++++++++++++++--
 3 files changed, 152 insertions(+), 28 deletions(-)

-- 
2.31.1

On Mon, 10 Jan 2022, Geliang Tang wrote:

> v9:
> - drop patch 1-3 in v8, they are accepted.
> - drop patch 6 in v8.
> - add a new patch "move the declarations of ssk and subflow" to avoid
>   the compiling errors when moving the mp_fail label.
> - update patch "reduce branching when writing MP_FAIL option" as Mat
>   suggested.
> - Change 'ADD+RM' from 'C' to 'P' in patch "clarify when options can
>   be used".

Hi Geliang -

I think patches 1-4 are ok for the export branch:

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>


There are still some fixes we'll need to squash (or get from upstream) 
before updating the unit tests and upstreaming, see patch 5 comments for 
details.

>
> Geliang Tang (3):
>  mptcp: move the declarations of ssk and subflow
>  mptcp: print out reset infos of MP_RST
>  selftests: mptcp: add mp_fail testcases
>
> Matthieu Baerts (2):
>  mptcp: reduce branching when writing MP_FAIL option
>  mptcp: clarify when options can be used
>
> net/mptcp/options.c                           |  64 +++++++---
> tools/testing/selftests/net/mptcp/config      |   5 +
> .../testing/selftests/net/mptcp/mptcp_join.sh | 111 ++++++++++++++++--
> 3 files changed, 152 insertions(+), 28 deletions(-)
>

--
Mat Martineau
Intel

Hi Geliang, Mat,

On 13/01/2022 00:33, Mat Martineau wrote:
> On Mon, 10 Jan 2022, Geliang Tang wrote:
> 
>> v9:
>> - drop patch 1-3 in v8, they are accepted.
>> - drop patch 6 in v8.
>> - add a new patch "move the declarations of ssk and subflow" to avoid
>>   the compiling errors when moving the mp_fail label.
>> - update patch "reduce branching when writing MP_FAIL option" as Mat
>>   suggested.
>> - Change 'ADD+RM' from 'C' to 'P' in patch "clarify when options can
>>   be used".
> 
> Hi Geliang -
> 
> I think patches 1-4 are ok for the export branch:
> 
> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

Thank you for having sent this new version and for the reviews!

Now in our tree (feat. for net-next) with Mat's RvB tag, without my SoB
on patch 4/5 and without patch 5/5:

- ac07cdb70be9: mptcp: move the declarations of ssk and subflow
- 77ef153f0748: mptcp: reduce branching when writing MP_FAIL option
- be77cda2def6: mptcp: clarify when options can be used
- d185331aff82: mptcp: print out reset infos of MP_RST
- Results: 459ae9092f30..26c341404c60

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220113T104129
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net