Re: FAILED: patch "[PATCH] selftests: mptcp: rm subflow with v4/v4mapped addr" failed to apply to 6.1-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Mon, Mar 04, 2024 at 11:07:01AM +0100, Matthieu Baerts wrote:
> Hi Greg,
> 
> On 04/03/2024 09:30, gregkh@linuxfoundation.org wrote:
> > The patch below does not apply to the 6.1-stable tree.
> 
> Thank you for the notification!
> 
> (...)
> 
> > Possible dependencies:
> > 
> > 7092dbee2328 ("selftests: mptcp: rm subflow with v4/v4mapped addr")
> > b850f2c7dd85 ("selftests: mptcp: add mptcp_lib_is_v6")
> > bdbef0a6ff10 ("selftests: mptcp: add mptcp_lib_kill_wait")
> > 757c828ce949 ("selftests: mptcp: update userspace pm test helpers")
> > 80775412882e ("selftests: mptcp: add chk_subflows_total helper")
> > 06848c0f341e ("selftests: mptcp: add evts_get_info helper")
> > 9168ea02b898 ("selftests: mptcp: fix wait_rm_addr/sf parameters")
> > f4a75e9d1100 ("selftests: mptcp: run userspace pm tests slower")
> > 03668c65d153 ("selftests: mptcp: join: rework detailed report")
> > 9e86a297796b ("selftests: mptcp: sockopt: format subtests results in TAP")
> > 7f117cd37c61 ("selftests: mptcp: join: format subtests results in TAP")
> > c4192967e62f ("selftests: mptcp: lib: format subtests results in TAP")
> > e198ad759273 ("selftests: mptcp: userspace_pm: uniform results printing")
> > 8320b1387a15 ("selftests: mptcp: userspace_pm: fix shellcheck warnings")
> > e141c1e8e4c1 ("selftests: mptcp: userspace pm: don't stop if error")
> > e571fb09c893 ("selftests: mptcp: add speed env var")
> > 4aadde088a58 ("selftests: mptcp: add fullmesh env var")
> > 080b7f5733fd ("selftests: mptcp: add fastclose env var")
> > 662aa22d7dcd ("selftests: mptcp: set all env vars as local ones")
> > 966c6c3adfb1 ("selftests: mptcp: userspace_pm: report errors with 'remove' tests")
> 
> (...)
> 
> > ------------------ original commit in Linus's tree ------------------
> > 
> > From 7092dbee23282b6fcf1313fc64e2b92649ee16e8 Mon Sep 17 00:00:00 2001
> > From: Geliang Tang <tanggeliang@kylinos.cn>
> > Date: Fri, 23 Feb 2024 17:14:12 +0100
> > Subject: [PATCH] selftests: mptcp: rm subflow with v4/v4mapped addr
> > 
> > Now both a v4 address and a v4-mapped address are supported when
> > destroying a userspace pm subflow, this patch adds a second subflow
> > to "userspace pm add & remove address" test, and two subflows could
> > be removed two different ways, one with the v4mapped and one with v4.
> I don't think it is worth having this patch backported to v6.1: there
> are a lot of conflicts because this patch depends on many others. Also,
> many CIs validating stable trees will use the selftests from the last
> stable version, I suppose. So this new test will be validated on older
> versions.
> 
> For v6.6 and v6.7, I can help to fix conflicts. I will just wait for the
> "queue/6.6" and "queue/6.7" branches to be updated with the latest
> patches :)

Should all now be up to date, I don't see any pending mptcp patches in
my review mbox to process.

thanks,

greg k-h