From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Cooper <jason@lakedaemon•net>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Marc Carino <marc.ceeeee@gmail•com>,
Matt Porter <mporter@linaro•org>,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd•com>
Subject: linux-next: manual merge of the irqchip tree with the arm-soc tree
Date: Tue, 29 Jul 2014 15:53:02 +1000 [thread overview]
Message-ID: <20140729155302.3c1d5437@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1063 bytes --]
Hi Jason,
Today's linux-next merge of the irqchip tree got a conflict in
Documentation/devicetree/bindings/arm/gic.txt between commit
f80b71397d09 ("ARM: brcmstb: gic: add compatible string for Broadcom
Brahma15") from the arm-soc tree and commit 3e44358c12cc ("") from the
irqchip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc Documentation/devicetree/bindings/arm/gic.txt
index c7d2fa156678,d2eea0b75580..000000000000
--- a/Documentation/devicetree/bindings/arm/gic.txt
+++ b/Documentation/devicetree/bindings/arm/gic.txt
@@@ -16,8 -17,9 +17,10 @@@ Main node required properties
"arm,cortex-a9-gic"
"arm,cortex-a7-gic"
"arm,arm11mp-gic"
+ "brcm,brahma-b15-gic"
+
- interrupt-controller : Identifies the node as an interrupt controller
+
- #interrupt-cells : Specifies the number of cells needed to encode an
interrupt source. The type shall be a <u32> and the value shall be 3.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-29 5:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 5:53 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-29 5:52 linux-next: manual merge of the irqchip tree with the arm-soc tree Stephen Rothwell
2018-05-29 7:41 ` Alexandre Torgue
2018-05-29 7:47 ` Marc Zyngier
2018-05-29 8:16 ` Alexandre Torgue
2018-05-29 8:39 ` Marc Zyngier
2018-05-29 8:55 ` Alexandre Torgue
2018-05-29 12:20 ` Ludovic BARRE
2018-05-30 5:10 ` Olof Johansson
2021-04-09 5:52 Stephen Rothwell
2021-04-23 3:22 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=20140729155302.3c1d5437@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Suravee.Suthikulpanit@amd$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=jason@lakedaemon$(echo .)net \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.ceeeee@gmail$(echo .)com \
--cc=mporter@linaro$(echo .)org \
--cc=olof@lixom$(echo .)net \
/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