Re: FAILED: patch "[PATCH] batman-adv: stop tp_meter sessions during mesh teardown" failed to apply to 5.10-stable tree

[Sven Eckelmann <sven@narfation.org>]

[-- Attachment #1: Type: text/plain, Size: 2401 bytes --]

On Friday, 15 May 2026 10:44:55 CEST gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 5.10-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 <stable@vger.kernel.org>.
> 
> 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-5.10.y
> git checkout FETCH_HEAD
> git cherry-pick -x 3d3cf6a7314aca4df0a6dde28ce784a2a30d0166
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026051555-germproof-bolt-6720@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
> 
> Possible dependencies:


I had a look at it but it would need get a backport of timer_shutdown_sync for 
the original patch. Then the version from 5.15 should work directly.

But when I've looked into the patches. I saw that there is a big gap already 
between 5.10 and 5.15.

Already backported in 5.15 (and could be used as reference for 5.10)

b0b0aa5d858d ("Documentation: Remove bogus claim about del_timer_sync()")
80b55772d41d ("ARM: spear: Do not use timer namespace for timer_shutdown() function")
5135c7150732 ("clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function")
6e1fc2591f11 ("clocksource/drivers/sp804: Do not use timer namespace for timer_shutdown() function")
82ed6f7ef58f ("timers: Replace BUG_ON()s")
2249b9ec4232 ("Documentation: Replace del_timer/del_timer_sync()")
d02e382cef06 ("timers: Silently ignore timers with a NULL function")
8553b5f2774a ("timers: Split [try_to_]del_timer[_sync]() to prepare for shutdown mode")
0cc04e80458a ("timers: Add shutdown mechanism to the internal functions")
f571faf6e443 ("timers: Provide timer_shutdown[_sync]()")
a31323bef2b6 ("timers: Update the documentation to reflect on the new timer_shutdown() API")
20739af07383 ("timers: Fix NULL function pointer race in timer_shutdown_sync()")

But between 5.10 and 5.15 are 134 patches which at least partially should be 
relevant for the backporting of timer_shutdown_sync.

For the moment, I will skip the backporting of timer_shutdown_sync and switch 
it to del_timer_sync() - which should work here because the re-arming will 
only happen by the timer.

Regards,
	Sven

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 228 bytes --]