All of lore.kernel.org
 help / color / mirror / Atom feed
* FAILED: patch "[PATCH] drivers: soc: atmel: add null entry at the end of" failed to apply to 5.4-stable tree
@ 2021-03-01 10:32 gregkh
  2021-03-01 10:52 ` Arnd Bergmann
  0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2021-03-01 10:32 UTC (permalink / raw)
  To: claudiu.beznea, arnd, nicolas.ferre; +Cc: stable


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 <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 975435132ecfef8de2118668c9f4f95086a0aae5 Mon Sep 17 00:00:00 2001
From: Claudiu Beznea <claudiu.beznea@microchip.com>
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.

Fixes: caab13b49604 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs")
Cc: stable@vger.kernel.org #4.12+
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>

diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
index 728d461ad6d6..698d21f50516 100644
--- a/drivers/soc/atmel/soc.c
+++ b/drivers/soc/atmel/soc.c
@@ -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)


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: FAILED: patch "[PATCH] drivers: soc: atmel: add null entry at the end of" failed to apply to 5.4-stable tree
  2021-03-01 10:32 FAILED: patch "[PATCH] drivers: soc: atmel: add null entry at the end of" failed to apply to 5.4-stable tree gregkh
@ 2021-03-01 10:52 ` Arnd Bergmann
  2021-03-01 11:15   ` gregkh
  0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2021-03-01 10:52 UTC (permalink / raw)
  To: gregkh; +Cc: Claudiu Beznea, Arnd Bergmann, Nicolas Ferre, # 3.4.x

On Mon, Mar 1, 2021 at 11:32 AM <gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org>.

> Fixes: caab13b49604 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs")
> Cc: stable@vger.kernel.org #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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: FAILED: patch "[PATCH] drivers: soc: atmel: add null entry at the end of" failed to apply to 5.4-stable tree
  2021-03-01 10:52 ` Arnd Bergmann
@ 2021-03-01 11:15   ` gregkh
  0 siblings, 0 replies; 3+ messages in thread
From: gregkh @ 2021-03-01 11:15 UTC (permalink / raw)
  To: Arnd Bergmann; +Cc: Claudiu Beznea, Arnd Bergmann, Nicolas Ferre, # 3.4.x

On Mon, Mar 01, 2021 at 11:52:17AM +0100, Arnd Bergmann wrote:
> On Mon, Mar 1, 2021 at 11:32 AM <gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org>.
> 
> > Fixes: caab13b49604 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs")
> > Cc: stable@vger.kernel.org #4.12+
> 
> Hi Greg,
> 
> Did you add a backport of the caab13b49604 patch 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

> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-03-01 11:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-01 10:32 FAILED: patch "[PATCH] drivers: soc: atmel: add null entry at the end of" failed to apply to 5.4-stable tree gregkh
2021-03-01 10:52 ` Arnd Bergmann
2021-03-01 11:15   ` gregkh

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.