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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 13 Aug 2021 13:29:09 +1000

Hi all,

Today's linux-next merge of the irqchip tree got a conflict in:

  include/linux/irq.h

between commit:

  826da771291f ("genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP")

from the tip tree and commit:

  e0c1a5b24f5b ("genirq: Add chip flag to denote automatic IRQ (un)masking")

from the irqchip tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/irq.h
index c8293c817646,0b45e42812d6..000000000000
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@@ -569,7 -577,7 +577,8 @@@ struct irq_chip 
   * IRQCHIP_SUPPORTS_NMI:              Chip can deliver NMIs, only for root irqchips
   * IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND:  Invokes __enable_irq()/__disable_irq() for wake irqs
   *                                    in the suspend path if they are in disabled state
 + * IRQCHIP_AFFINITY_PRE_STARTUP:      Default affinity update before startup
+  * IRQCHIP_AUTOMASKS_FLOW:            chip->ack() masks and chip->eoi() unmasks
   */
  enum {
  	IRQCHIP_SET_TYPE_MASKED			= (1 <<  0),
@@@ -582,7 -590,7 +591,8 @@@
  	IRQCHIP_SUPPORTS_LEVEL_MSI		= (1 <<  7),
  	IRQCHIP_SUPPORTS_NMI			= (1 <<  8),
  	IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND	= (1 <<  9),
 -	IRQCHIP_AUTOMASKS_FLOW                  = (1 <<  10),
 +	IRQCHIP_AFFINITY_PRE_STARTUP		= (1 << 10),
++	IRQCHIP_AUTOMASKS_FLOW                  = (1 << 11),
  };
  
  #include <linux/irqdesc.h>