From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marc Zyngier <maz@kernel•org>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Anup Patel <apatel@ventanamicro•com>,
Johan Hovold <johan+linaro@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the irqchip tree with the tip tree
Date: Mon, 6 Feb 2023 12:19:54 +1100 [thread overview]
Message-ID: <20230206121954.57b521fe@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2007 bytes --]
Hi all,
Today's linux-next merge of the irqchip tree got a conflict in:
drivers/irqchip/irq-apple-aic.c
between commit:
0e2213fe0ab4 ("irqchip: Use irq_domain_alloc_irqs()")
from the tip tree and commit:
c19f89719428 ("irqchip/apple-aic: Move over to core ipi-mux")
from the irqchip tree.
I fixed it up (the latter removed the code modified by the former) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
However, an earlier commit in the irqchip tree
835a486cd9f5 ("genirq: Add mechanism to multiplex a single HW IPI")
created a new user of __irq_domain_alloc_irqs(), so I also added the
following merge fix up patch:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 6 Feb 2023 12:14:47 +1100
Subject: [PATCH] fix up for "irqchip: Use irq_domain_alloc_irqs()"
interacting with "genirq: Add mechanism to multiplex a single HW IPI"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
kernel/irq/ipi-mux.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/irq/ipi-mux.c b/kernel/irq/ipi-mux.c
index 3a403c3a785d..fa4fc18c6131 100644
--- a/kernel/irq/ipi-mux.c
+++ b/kernel/irq/ipi-mux.c
@@ -185,8 +185,7 @@ int ipi_mux_create(unsigned int nr_ipi, void (*mux_send)(unsigned int cpu))
domain->flags |= IRQ_DOMAIN_FLAG_IPI_SINGLE;
irq_domain_update_bus_token(domain, DOMAIN_BUS_IPI);
- rc = __irq_domain_alloc_irqs(domain, -1, nr_ipi,
- NUMA_NO_NODE, NULL, false, NULL);
+ rc = irq_domain_alloc_irqs(domain, nr_ipi, NUMA_NO_NODE, NULL);
if (rc <= 0) {
pr_err("unable to alloc IRQs from IPI Mux domain\n");
goto fail_free_domain;
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-02-06 1:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-06 1:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-13 3:29 linux-next: manual merge of the irqchip tree with the tip tree Stephen Rothwell
2020-06-02 4:42 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230206121954.57b521fe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=apatel@ventanamicro$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=johan+linaro@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox