[6.1.y,0/3] selftests: mptcp: fix backport issues

Message

Matthieu Baerts Sept. 5, 2024, 2:43 p.m. UTC

Greg recently reported that two of the backport patches I sent for v6.1
could not be applied [1][2]. It looks like it was because some other
patches have been applied twice, using different versions [3].

After having dropped the duplicated patches, the backport patches that 
couldn't be applied were still causing issues. It looks like it is due 
to quilt/patch having applied some code at the wrong place. This is 
fixed in patch 1/3. After that, the same two patches can be applied 
without any issue. They have been added in this series to help just in 
case.

Link: https://lore.kernel.org/2024090455-precook-unplanned-52b3@gregkh [1]
Link: https://lore.kernel.org/2024090420-passivism-garage-f753@gregkh [2]
Link: https://lore.kernel.org/[e-mail] [3]

Matthieu Baerts (NGI0) (3):
  selftests: mptcp: fix backport issues
  selftests: mptcp: join: validate event numbers
  selftests: mptcp: join: check re-re-adding ID 0 signal

 .../testing/selftests/net/mptcp/mptcp_join.sh | 234 ++++++++++++------
 .../testing/selftests/net/mptcp/mptcp_lib.sh  |  15 ++
 2 files changed, 180 insertions(+), 69 deletions(-)

Comments

Greg Kroah-Hartman Sept. 8, 2024, 2:03 p.m. UTC | #1

On Thu, Sep 05, 2024 at 04:43:07PM +0200, Matthieu Baerts (NGI0) wrote:
> Greg recently reported that two of the backport patches I sent for v6.1
> could not be applied [1][2]. It looks like it was because some other
> patches have been applied twice, using different versions [3].
> 
> After having dropped the duplicated patches, the backport patches that 
> couldn't be applied were still causing issues. It looks like it is due 
> to quilt/patch having applied some code at the wrong place. This is 
> fixed in patch 1/3. After that, the same two patches can be applied 
> without any issue. They have been added in this series to help just in 
> case.
> 
> Link: https://lore.kernel.org/2024090455-precook-unplanned-52b3@gregkh [1]
> Link: https://lore.kernel.org/2024090420-passivism-garage-f753@gregkh [2]
> Link: https://lore.kernel.org/[e-mail] [3]

All now queued up, thanks.

greg k-h