public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, stable@vger.kernel.org,
	gregkh@linuxfoundation.org
Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Subject: [PATCH 6.1.y 0/5] Backport of "mptcp: pm: don't try to create sf if alloc failed" and more
Date: Tue, 13 Aug 2024 11:28:16 +0200	[thread overview]
Message-ID: <20240813092815.966749-7-matttbe@kernel.org> (raw)
In-Reply-To: <2024081245-deem-refinance-8605@gregkh>

Patches "mptcp: pm: don't try to create sf if alloc failed" and "mptcp:
pm: do not ignore 'subflow' if 'signal' flag is also set" depend on
"mptcp: pm: reduce indentation blocks" which depends on "mptcp: pass
addr to mptcp_pm_alloc_anno_list". These two patches are simple ones,
doing some refactoring that can be picked to ease the backports.

Including these patches avoids conflicts with the two other patches.

While at it, also picked the modifications of the selftests to validate
the other modifications. Note that this last patch has been modified to
work on v6.1.

If you prefer, feel free to backport these 5 commits to v6.1:

  528cb5f2a1e8 c95eb32ced82 cd7c957f936f 85df533a787b 4d2868b5d191

In this order, and thanks to 528cb5f2a1e8 and c95eb32ced82, there are no
conflicts.

Details:

- 528cb5f2a1e8 ("mptcp: pass addr to mptcp_pm_alloc_anno_list")
- c95eb32ced82 ("mptcp: pm: reduce indentation blocks")
- cd7c957f936f ("mptcp: pm: don't try to create sf if alloc failed")
- 85df533a787b ("mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set")
- 4d2868b5d191 ("selftests: mptcp: join: test both signal & subflow")


Geliang Tang (1):
  mptcp: pass addr to mptcp_pm_alloc_anno_list

Matthieu Baerts (NGI0) (4):
  mptcp: pm: reduce indentation blocks
  mptcp: pm: don't try to create sf if alloc failed
  mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set
  selftests: mptcp: join: test both signal & subflow

 net/mptcp/pm_netlink.c                        | 49 ++++++++++++-------
 net/mptcp/pm_userspace.c                      |  2 +-
 net/mptcp/protocol.h                          |  2 +-
 .../testing/selftests/net/mptcp/mptcp_join.sh | 14 ++++++
 4 files changed, 47 insertions(+), 20 deletions(-)

-- 
2.45.2


  reply	other threads:[~2024-08-13  9:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-12 12:39 FAILED: patch "[PATCH] mptcp: pm: don't try to create sf if alloc failed" failed to apply to 6.1-stable tree gregkh
2024-08-13  9:28 ` Matthieu Baerts (NGI0) [this message]
2024-08-14 17:45   ` [PATCH 6.1.y 0/5] Backport of "mptcp: pm: don't try to create sf if alloc failed" and more Greg KH
2024-08-13  9:28 ` [PATCH 6.1.y 1/5] mptcp: pass addr to mptcp_pm_alloc_anno_list Matthieu Baerts (NGI0)
2024-08-13  9:28 ` [PATCH 6.1.y 2/5] mptcp: pm: reduce indentation blocks Matthieu Baerts (NGI0)
2024-08-13  9:28 ` [PATCH 6.1.y 3/5] mptcp: pm: don't try to create sf if alloc failed Matthieu Baerts (NGI0)
2024-08-13  9:28 ` [PATCH 6.1.y 4/5] mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set Matthieu Baerts (NGI0)
2024-08-13  9:28 ` [PATCH 6.1.y 5/5] selftests: mptcp: join: test both signal & subflow Matthieu Baerts (NGI0)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240813092815.966749-7-matttbe@kernel.org \
    --to=matttbe@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=mptcp@lists.linux.dev \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox