From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marc Zyngier <maz@kernel•org>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Valentin Schneider <valentin.schneider@arm•com>
Subject: linux-next: manual merge of the irqchip tree with the tip tree
Date: Fri, 13 Aug 2021 13:29:09 +1000 [thread overview]
Message-ID: <20210813132909.28f1c34c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1780 bytes --]
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>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-08-13 3:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 3:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-06 1:19 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=20210813132909.28f1c34c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=valentin.schneider@arm$(echo .)com \
/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