FAILED: patch "[PATCH] irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP" failed to apply to 6.10-stable tree

FAILED: patch "[PATCH] irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP" failed to apply to 6.10-stable tree

[gregkh]

The patch below does not apply to the 6.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-6.10.y
git checkout FETCH_HEAD
git cherry-pick -x 080402007007ca1bed8bcb103625137a5c8446c6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024072916-brewing-cavalier-a90a@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..

Possible dependencies:

080402007007 ("irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP and !ACPI")
d633da5d3ab1 ("irqchip/gic-v3: Add support for ACPI's disabled but 'online capable' CPUs")
fa2dabe57220 ("irqchip/gic-v3: Don't return errors from gic_acpi_match_gicc()")

thanks,

greg k-h

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

From 080402007007ca1bed8bcb103625137a5c8446c6 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 5 Jul 2024 12:54:29 +0100
Subject: [PATCH] irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP
 and !ACPI

Compiling the GICv3 driver on arm32 with CONFIG_SMP disabled
(CONFIG_ACPI is not available) generates an unused variable warning for
'broken_rdists'. Add a __maybe_unused attribute to silence the compiler.

Fixes: d633da5d3ab1 ("irqchip/gic-v3: Add support for ACPI's disabled but 'online capable' CPUs")
Cc: <stable@vger.kernel.org> # .x
Acked-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index cc81515c1413..18619d29b2ed 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -44,7 +44,7 @@
 
 #define GIC_IRQ_TYPE_PARTITION	(GIC_IRQ_TYPE_LPI + 1)
 
-static struct cpumask broken_rdists __read_mostly;
+static struct cpumask broken_rdists __read_mostly __maybe_unused;
 
 struct redist_region {
 	void __iomem		*redist_base;

Re: FAILED: patch "[PATCH] irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP" failed to apply to 6.10-stable tree

[Marc Zyngier]

On Mon, 29 Jul 2024 08:51:16 +0100,
<gregkh@linuxfoundation.org> wrote:
> 
> 
> The patch below does not apply to the 6.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-6.10.y
> git checkout FETCH_HEAD
> git cherry-pick -x 080402007007ca1bed8bcb103625137a5c8446c6
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024072916-brewing-cavalier-a90a@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
> 
> Possible dependencies:
> 
> 080402007007 ("irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP and !ACPI")
> d633da5d3ab1 ("irqchip/gic-v3: Add support for ACPI's disabled but 'online capable' CPUs")
> fa2dabe57220 ("irqchip/gic-v3: Don't return errors from gic_acpi_match_gicc()")

None of these three patches should be stable candidate for 6.10. They
only matter to CPU hotplug, which is a new feature for 6.11 and has
no purpose being backported.

Thanks,

	M.

-- 
Without deviation from the norm, progress is not possible.

Re: FAILED: patch "[PATCH] irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP" failed to apply to 6.10-stable tree

[Greg KH]

On Mon, Jul 29, 2024 at 09:10:54AM +0100, Marc Zyngier wrote:
> On Mon, 29 Jul 2024 08:51:16 +0100,
> <gregkh@linuxfoundation.org> wrote:
> > 
> > 
> > The patch below does not apply to the 6.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-6.10.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 080402007007ca1bed8bcb103625137a5c8446c6
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024072916-brewing-cavalier-a90a@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
> > 
> > Possible dependencies:
> > 
> > 080402007007 ("irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP and !ACPI")
> > d633da5d3ab1 ("irqchip/gic-v3: Add support for ACPI's disabled but 'online capable' CPUs")
> > fa2dabe57220 ("irqchip/gic-v3: Don't return errors from gic_acpi_match_gicc()")
> 
> None of these three patches should be stable candidate for 6.10. They
> only matter to CPU hotplug, which is a new feature for 6.11 and has
> no purpose being backported.

That's fine, thanks, it was odd that this commit was tagged for stable
inclusion at all...

greg k-h

Re: FAILED: patch "[PATCH] irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP" failed to apply to 6.10-stable tree

[Catalin Marinas]

On Mon, Jul 29, 2024 at 10:20:03AM +0200, Greg Kroah-Hartman wrote:
> On Mon, Jul 29, 2024 at 09:10:54AM +0100, Marc Zyngier wrote:
> > On Mon, 29 Jul 2024 08:51:16 +0100,
> > <gregkh@linuxfoundation.org> wrote:
> > > The patch below does not apply to the 6.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-6.10.y
> > > git checkout FETCH_HEAD
> > > git cherry-pick -x 080402007007ca1bed8bcb103625137a5c8446c6
> > > # <resolve conflicts, build, test, etc.>
> > > git commit -s
> > > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024072916-brewing-cavalier-a90a@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
> > > 
> > > Possible dependencies:
> > > 
> > > 080402007007 ("irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP and !ACPI")
> > > d633da5d3ab1 ("irqchip/gic-v3: Add support for ACPI's disabled but 'online capable' CPUs")
> > > fa2dabe57220 ("irqchip/gic-v3: Don't return errors from gic_acpi_match_gicc()")
> > 
> > None of these three patches should be stable candidate for 6.10. They
> > only matter to CPU hotplug, which is a new feature for 6.11 and has
> > no purpose being backported.
> 
> That's fine, thanks, it was odd that this commit was tagged for stable
> inclusion at all...

Ah, sorry, my script for generating the Fixes line inserted a cc stable
and I missed it. It should have only had the Fixes tag for something
that went in 6.11, no backports.

-- 
Catalin