FAILED: patch "[PATCH] irqchip/gic-v3: Fix 'broken_rdists' unused warning when !SMP" failed to apply to 6.10-stable tree
[email protected]
maintainerThe 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 <[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.10.y
git checkout FETCH_HEAD
git cherry-pick -x 080402007007ca1bed8bcb103625137a5c8446c6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --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 <[email protected]>
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.
drivers/irqchip/irq-gic-v3.c +1 -1
@@ -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;
Marc Zyngier
maintainerQuoted 16 lines · On Mon, 29 Jul 2024 08:51:16 +0100, <[email protected]> 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 <[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.10.y
git checkoutFETCH_HEAD
git cherry-pick -x080402007007ca1bed8bcb103625137a5c8446c6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024072916-brewing-cavalier-a90a@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..
Quoted 5 lines
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 fromgic_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.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Greg KH
maintainerQuoted 20 lines · Marc Zyngier
Quoted 18 lines · On Mon, 29 Jul 2024 08:51:16 +0100, <[email protected]> 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 <[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.10.y
git checkoutFETCH_HEAD
git cherry-pick -x080402007007ca1bed8bcb103625137a5c8446c6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024072916-brewing-cavalier-a90a@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..Possible dependencies:
Quoted 7 lines
Quoted 3 lines
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 fromgic_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
Quoted 23 lines · Greg Kroah-Hartman
Quoted 22 lines · Marc Zyngier
Quoted 19 lines · On Mon, 29 Jul 2024 08:51:16 +0100, <[email protected]> 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 <[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.10.y
git checkoutFETCH_HEAD
git cherry-pick -x080402007007ca1bed8bcb103625137a5c8446c6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --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 fromgic_acpi_match_gicc()")
Quoted 6 lines
Quoted 3 lines
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.
Signature · 1 line
Catalin