Subject: linux-next: manual merge of the irqchip tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 6 Feb 2023 12:19:54 +1100

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 <[email-masked]>
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 <[email-masked]>
---
 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