FAILED: patch "[PATCH] drivers: soc: atmel: add null entry at the end of" failed to apply to 5.4-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.4-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]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 975435132ecfef8de2118668c9f4f95086a0aae5 Mon Sep 17 00:00:00 2001
From: Claudiu Beznea <[email protected]>
Date: Fri, 22 Jan 2021 14:21:34 +0200
Subject: [PATCH] drivers: soc: atmel: add null entry at the end of
at91_soc_allowed_list[]
of_match_node() calls __of_match_node() which loops though the entries of matches array. It stops when condition:
(matches->name[0] || matches->type[0] || matches->compatible[0]) is false. Thus, add a null entry at the end of at91_soc_allowed_list[] array.
drivers/soc/atmel/soc.c +2 -1
@@ -275,7 +275,8 @@ static const struct of_device_id at91_soc_allowed_list[] __initconst = { { .compatible = "atmel,at91rm9200", }, { .compatible = "atmel,at91sam9", }, { .compatible = "atmel,sama5", }, - { .compatible = "atmel,samv7", } + { .compatible = "atmel,samv7", }, + { } }; static int __init atmel_soc_device_init(void)
Quoted 9 lines · On Mon, Mar 1, 2021 at 11:32 AM <[email protected]> wrote:
The patch below does not apply to the 5.4-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]>.Fixes caab13b49604 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs")Cc [email protected] #4.12+
Hi Greg,
Did you add a backport of the caab13b49604 patch to 5.4 and earlier?
Without that patch, this one will not apply, but if you did apply caab13b49604, we need this one as well, and should do a backport.
Arnd
gregkh
maintainerQuoted 8 lines · Arnd Bergmann
Quoted 6 lines · On Mon, Mar 1, 2021 at 11:32 AM <[email protected]> wrote:
The patch below does not apply to the 5.4-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]>.
Quoted 6 lines
Quoted 2 lines
Fixes caab13b49604 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs")Cc [email protected] #4.12+Hi Greg,
Did you add a backport of the
caab13b49604patch to 5.4 and earlier?
Yes, it is in the following releases:
4.14.219 4.19.173 5.4.95 5.10.13 5.11
Quoted 2 lines
Without that patch, this one will not apply, but if you did apply
caab13b49604, we need this one as well, and should do a backport.
Agreed, that's why I asked for one :)
thanks,
greg k-h