From: Matthieu Baerts <matttbe@kernel.org>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org, MPTCP Upstream <mptcp@lists.linux.dev>,
Geliang Tang <tanggeliang@kylinos.cn>,
Mat Martineau <martineau@kernel.org>,
"David S . Miller" <davem@davemloft.net>
Subject: Re: [PATCH 6.6.y] mptcp: add needs_id for netlink appending addr
Date: Tue, 27 Feb 2024 12:04:22 +0100 [thread overview]
Message-ID: <2c80d410-b480-4043-b17f-2aaa357e5d41@kernel.org> (raw)
In-Reply-To: <2024022723-outshoot-unkind-734f@gregkh>
Hi Greg,
On 27/02/2024 11:22, Greg KH wrote:
> On Mon, Feb 26, 2024 at 10:56:21PM +0100, Matthieu Baerts (NGI0) wrote:
>> From: Geliang Tang <tanggeliang@kylinos.cn>
>>
>> Just the same as userspace PM, a new parameter needs_id is added for
>> in-kernel PM mptcp_pm_nl_append_new_local_addr() too.
>>
>> Add a new helper mptcp_pm_has_addr_attr_id() to check whether an address
>> ID is set from PM or not.
>>
>> In mptcp_pm_nl_get_local_id(), needs_id is always true, but in
>> mptcp_pm_nl_add_addr_doit(), pass mptcp_pm_has_addr_attr_id() to
>> needs_it.
>>
>> Fixes: efd5a4c04e18 ("mptcp: add the address ID assignment bitmap")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
>> Reviewed-by: Mat Martineau <martineau@kernel.org>
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>> (cherry picked from commit 584f3894262634596532cf43a5e782e34a0ce374)
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
>> ---
>> Notes:
>> - conflicts in pm_netlink.c because the new helper function expected to
>> be on top of mptcp_pm_nl_add_addr_doit() which has been recently
>> renamed in commit 1e07938e29c5 ("net: mptcp: rename netlink handlers
>> to mptcp_pm_nl_<blah>_{doit,dumpit}").
>> - use mptcp_pm_addr_policy instead of mptcp_pm_address_nl_policy, the
>> new name after commit 1d0507f46843 ("net: mptcp: convert netlink from
>> small_ops to ops").
>> ---
>> net/mptcp/pm_netlink.c | 24 +++++++++++++++++++-----
>> 1 file changed, 19 insertions(+), 5 deletions(-)
>
> Don't we also need a 5.15.y version of this commit?
Good point, yes, according to the 'Fixes' tag, we need it as well for
5.15.y.
It looks like no "FAILED: patch" notification has been sent for this
patch for the 5.15-stable tree. Is it normal?
I'm asking this because I rely on these notifications to know if I need
to help to fix conflicts. I don't regularly track if patches we sent
upstream with 'Cc: stable' & 'Fixes' tags have been backported. It is
just to know if we need to modify our way of working :)
> All of the backports you sent are now queued up, thanks!
Thank you for all the great work!
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.
next prev parent reply other threads:[~2024-02-27 11:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 13:04 FAILED: patch "[PATCH] mptcp: add needs_id for netlink appending addr" failed to apply to 6.6-stable tree gregkh
2024-02-26 21:56 ` [PATCH 6.6.y] mptcp: add needs_id for netlink appending addr Matthieu Baerts (NGI0)
2024-02-27 10:22 ` Greg KH
2024-02-27 11:04 ` Matthieu Baerts [this message]
2024-02-27 13:01 ` Greg KH
2024-02-27 13:20 ` Matthieu Baerts
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=2c80d410-b480-4043-b17f-2aaa357e5d41@kernel.org \
--to=matttbe@kernel.org \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=martineau@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=stable@vger.kernel.org \
--cc=tanggeliang@kylinos.cn \
/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