Re: [PATCH mptcp-next v17 0/9] userspace pm remove id 0 subflow & address

[Matthieu Baerts <matttbe@kernel.org>]

Hi Geliang,

On 23/10/2023 01:06, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 17/10/2023 05:00, Geliang Tang wrote:
>> From: Geliang Tang <geliang.tang@suse.com>
>>
>> v17:
>>  - include "fix userspace pm CI failures" series.
>>  - update __mptcp_has_initial_subflow as Paolo suggested.
>>  - update chk_subflows_total.
>>  - update selftests.
> 
> Thank you for the new version, it looks good to me!
> 
> Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
> 
> Now in our tree: a part in 'fixes for -net' and the rest in 'features
> for net-next' and this has caused conflicts, please see below:
> 
> New patches for t/upstream-net and t/upstream:
> - 20c92e1b1473: selftests: mptcp: run userspace pm tests slower
> - 54b8c59e976f: selftests: mptcp: fix wait_rm_addr/sf parameters
> - a9f72db763e0: mptcp: userspace pm send RM_ADDR for ID 0
>   - Note that I renamed the new helper to keep the 'mptcp_userspace_pm_'
>     prefix we can find in other helpers in this file.
> - Results: 9a34fc4dbad6..a1d8e0942055 (export-net)
> 
> Conflicts:
> - 9f7653e25504: conflict in
> t/net-mptcp-rename-netlink-handlers-to-mptcp_pm_nl_-blah-_-doit-dumpit
> - 1dae6c24941f: conflict in t/mptcp-define-more-local-variables-sk
> - bff6a9fde262: conflict in
> t/selftests-mptcp-update-userspace-pm-test-helpers
> - Results: 65682b5b41eb..554ef3499597 (export)
> 
> Squash-to patches:
> - 964ed0906f76: "squashed" patch 3/9 in "selftests: mptcp: userspace pm
> create id 0 subflow"
> - 6a9ab12adf72: "squashed" patch 4/9 in "mptcp: add
> mptcpi_subflows_total counter"
> - a65a15f44388: "squashed" patch 5/9 in "selftests: mptcp: add
> chk_subflows_total helper"
> - e5424462cd82: tg:msg: update after the recent squash-to patch
> - Results: 554ef3499597..7592debc8c8b (export)
> 
> New patches for t/upstream:
> - 492717f096ae: mptcp: userspace pm rename remove_err to out
> - 702694cb477d: selftests: mptcp: userspace pm send RM_ADDR for ID 0

Oops, I forgot patch 6/9. Just added before "selftests: mptcp: userspace
pm send RM_ADDR for ID 0":

New patches for t/upstream:
- 4118c35872b6: selftests: mptcp: userspace pm remove initial subflow
- ee73a6e81efa: conflict in
t/selftests-mptcp-userspace-pm-send-RM_ADDR-for-ID-0
- Results: 1b6c8d99ae9c..368681114ab6 (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20231022T231456

Cheers,
Matt