FAILED: patch "[PATCH] mptcp: remove duplicate sk_reset_timer call" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 5d13349472ac8abcbcb94407969aa0fdc2e1f1be
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025082230-overlay-latitude-1a75@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 5d13349472ac8abcbcb94407969aa0fdc2e1f1be Mon Sep 17 00:00:00 2001
From: Geliang Tang <[email protected]>
Date: Fri, 15 Aug 2025 19:28:22 +0200
Subject: [PATCH] mptcp: remove duplicate sk_reset_timer call
sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list.
Simplify the code by using a 'goto' statement to eliminate the duplication.
Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.
net/mptcp/pm.c +2 -3
@@ -353,9 +353,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,if (WARN_ON_ONCE (mptcp_pm_is_kernel (msk)))return false; -sk_reset_timer (sk, &add_entry->add_timer, - jiffies +mptcp_get_add_addr_timeout (net)); -return true; + goto reset_timer; } add_entry =kmalloc (sizeof (*add_entry),GFP_ATOMIC );
@@ -369,6 +367,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, add_entry->retrans_times =0 ;timer_setup (&add_entry->add_timer, mptcp_pm_add_timer,0 ); +reset_timer:sk_reset_timer (sk, &add_entry->add_timer, jiffies +mptcp_get_add_addr_timeout (net));
Sasha Levin
maintainerPATCH 1/1 mptcp: remove duplicate sk_reset_timer call
From: Geliang Tang <[email protected]>
[ Upstream commit 5d13349472ac8abcbcb94407969aa0fdc2e1f1be ]
sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list.
Simplify the code by using a 'goto' statement to eliminate the duplication.
Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.
--- net/mptcp/pm_netlink.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/mptcp/pm_netlink.c +2 -3
@@ -383,9 +383,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,if (WARN_ON_ONCE (mptcp_pm_is_kernel (msk)))return false; -sk_reset_timer (sk, &add_entry->add_timer, - jiffies +mptcp_get_add_addr_timeout (net)); -return true; + goto reset_timer; } add_entry =kmalloc (sizeof (*add_entry),GFP_ATOMIC );
@@ -399,6 +397,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, add_entry->retrans_times =0 ;timer_setup (&add_entry->add_timer, mptcp_pm_add_timer,0 ); +reset_timer:sk_reset_timer (sk, &add_entry->add_timer, jiffies +mptcp_get_add_addr_timeout (net));
Signature · 1 line
2.50.1
Greg KH
maintainerRe: [PATCH 6.1.y] mptcp: remove duplicate sk_reset_timer call
Quoted 21 lines · Sasha Levin
From: Geliang Tang <[email protected]>
[ Upstream commit
5d13349472ac8abcbcb94407969aa0fdc2e1f1be]
sk_reset_timer()was called twice inmptcp_pm_alloc_anno_list.Simplify the code by using a 'goto' statement to eliminate the duplication.
Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.
Fixes 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")Signed-off-by Geliang Tang <[email protected]>Reviewed-by Matthieu Baerts (NGI0) <[email protected]>Signed-off-by Matthieu Baerts (NGI0) <[email protected]>Link https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org open hereSigned-off-by Jakub Kicinski <[email protected]>[ adjusted function location from pm.c to pm_netlink.c ]Signed-off-by Sasha Levin <[email protected]>
Quoted 3 lines
--- net/mptcp/pm_netlink.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Didn't apply cleanly :(
Matthieu Baerts
maintainerRe: [PATCH 6.1.y] mptcp: remove duplicate sk_reset_timer call
Hi Greg, Sasha,
24 Aug 2025 09:02:56 Greg KH <[email protected]>:
Quoted 26 lines · Sasha Levin
Quoted 21 lines
From: Geliang Tang <[email protected]>
[ Upstream commit
5d13349472ac8abcbcb94407969aa0fdc2e1f1be]
sk_reset_timer()was called twice inmptcp_pm_alloc_anno_list.Simplify the code by using a 'goto' statement to eliminate the duplication.
Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.
Fixes 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")Signed-off-by Geliang Tang <[email protected]>Reviewed-by Matthieu Baerts (NGI0) <[email protected]>Signed-off-by Matthieu Baerts (NGI0) <[email protected]>Link https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org open hereSigned-off-by Jakub Kicinski <[email protected]>[ adjusted function location from pm.c to pm_netlink.c ]Signed-off-by Sasha Levin <[email protected]>Quoted 3 lines
---
net/mptcp/pm_netlink.c| 5 ++---1 file changed, 2 insertions(+), 3 deletions(-)
Quoted 1 line
Didn't apply cleanly :(
I don't know if it is the reason, but I sent the same patches on Friday:
https://lore.kernel.org/[email protected]/T
Cheers,
Matt
Greg KH
maintainerRe: [PATCH 6.1.y] mptcp: remove duplicate sk_reset_timer call
Quoted 30 lines · Matthieu Baerts
Hi Greg, Sasha,
24 Aug 2025 09:02:56 Greg KH <[email protected]>:
Quoted 26 lines · Sasha Levin
Quoted 24 lines
From: Geliang Tang <[email protected]>
[ Upstream commit
5d13349472ac8abcbcb94407969aa0fdc2e1f1be]
sk_reset_timer()was called twice inmptcp_pm_alloc_anno_list.Simplify the code by using a 'goto' statement to eliminate the duplication.
Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.
Fixes 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")Signed-off-by Geliang Tang <[email protected]>Reviewed-by Matthieu Baerts (NGI0) <[email protected]>Signed-off-by Matthieu Baerts (NGI0) <[email protected]>Link https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org open hereSigned-off-by Jakub Kicinski <[email protected]>[ adjusted function location from pm.c to pm_netlink.c ]Signed-off-by Sasha Levin <[email protected]>---
net/mptcp/pm_netlink.c| 5 ++---1 file changed, 2 insertions(+), 3 deletions(-)
Quoted 5 lines
Quoted 1 line
Didn't apply cleanly :(
I don't know if it is the reason, but I sent the same patches on Friday:
And it didn't apply either?
I'm confused...
Matthieu Baerts
maintainerRe: [PATCH 6.1.y] mptcp: remove duplicate sk_reset_timer call
Hi Greg,
24 Aug 2025 09:15:22 Greg KH <[email protected]>:
Quoted 33 lines · Matthieu Baerts
Quoted 32 lines
Hi Greg, Sasha,
24 Aug 2025 09:02:56 Greg KH <[email protected]>:
Quoted 27 lines · Sasha Levin
Quoted 21 lines
From: Geliang Tang <[email protected]>
[ Upstream commit
5d13349472ac8abcbcb94407969aa0fdc2e1f1be]
sk_reset_timer()was called twice inmptcp_pm_alloc_anno_list.Simplify the code by using a 'goto' statement to eliminate the duplication.
Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.
Fixes 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")Signed-off-by Geliang Tang <[email protected]>Reviewed-by Matthieu Baerts (NGI0) <[email protected]>Signed-off-by Matthieu Baerts (NGI0) <[email protected]>Link https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org open hereSigned-off-by Jakub Kicinski <[email protected]>[ adjusted function location from pm.c to pm_netlink.c ]Signed-off-by Sasha Levin <[email protected]>Quoted 3 lines
---
net/mptcp/pm_netlink.c| 5 ++---1 file changed, 2 insertions(+), 3 deletions(-)Didn't apply cleanly :(
Quoted 7 lines
Quoted 3 lines
I don't know if it is the reason, but I sent the same patches on Friday:
And it didn't apply either?
I'm confused...
It looks like you first applied this other patch from Sasha for 6.1.y:
https://lore.kernel.org/[email protected]
But this patch includes the one here you are trying to apply, instead of depending on it.
In terms of code, the result is the same, but there is now one commit instead of 2. (Which is fine for me)
Cheers,
Matt
Greg KH
maintainerRe: [PATCH 6.1.y] mptcp: remove duplicate sk_reset_timer call
Quoted 47 lines · Matthieu Baerts
Hi Greg,
24 Aug 2025 09:15:22 Greg KH <[email protected]>:
Quoted 33 lines · Matthieu Baerts
Quoted 32 lines
Hi Greg, Sasha,
24 Aug 2025 09:02:56 Greg KH <[email protected]>:
Quoted 27 lines · Sasha Levin
Quoted 21 lines
From: Geliang Tang <[email protected]>
[ Upstream commit
5d13349472ac8abcbcb94407969aa0fdc2e1f1be]
sk_reset_timer()was called twice inmptcp_pm_alloc_anno_list.Simplify the code by using a 'goto' statement to eliminate the duplication.
Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason.
Fixes 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")Signed-off-by Geliang Tang <[email protected]>Reviewed-by Matthieu Baerts (NGI0) <[email protected]>Signed-off-by Matthieu Baerts (NGI0) <[email protected]>Link https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org open hereSigned-off-by Jakub Kicinski <[email protected]>[ adjusted function location from pm.c to pm_netlink.c ]Signed-off-by Sasha Levin <[email protected]>Quoted 3 lines
---
net/mptcp/pm_netlink.c| 5 ++---1 file changed, 2 insertions(+), 3 deletions(-)Didn't apply cleanly :(
Quoted 7 lines
Quoted 3 lines
I don't know if it is the reason, but I sent the same patches on Friday:
And it didn't apply either?
I'm confused...
It looks like you first applied this other patch from Sasha for 6.1.y:
Quoted 7 lines
https://lore.kernel.org/[email protected]
But this patch includes the one here you are trying to apply, instead of depending on it.
In terms of code, the result is the same, but there is now one commit instead of 2. (Which is fine for me)
Ah, thanks for figuring it out, I'll leave it as-is for now, as unwinding it will be a mess :)
greg "too many stable trees" k-h