From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mircea Gherzan <mgherzan@gmail.com>,
Russell King <rmk@arm.linux.org.uk>,
Rob Herring <rob.herring@calxeda.com>
Subject: linux-next: manual merge of the irqdomain tree with the arm tree
Date: Mon, 19 Mar 2012 17:22:54 +1100 [thread overview]
Message-ID: <20120319172254.78e16fcb56fef216cc8fafac@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 896 bytes --]
Hi Grant,
Today's linux-next merge of the irqdomain tree got a conflict in
arch/arm/Kconfig between commit 4755ccad6d53 ("ARM: 7259/3: net: JIT
compiler for packet filters") from the arm tree and commit 2378b56c3747
("ARM: kconfig: always select IRQ_DOMAIN") from the irqdomain tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/Kconfig
index 3795400,c857283..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -33,7 -31,8 +33,8 @@@ config AR
select GENERIC_IRQ_SHOW
select CPU_PM if (SUSPEND || CPU_IDLE)
select GENERIC_PCI_IOMAP
+ select HAVE_BPF_JIT
+ select IRQ_DOMAIN
help
The ARM series is a line of low-power-consumption RISC chip designs
licensed by ARM Ltd and targeted at embedded applications and
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-19 6:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 6:22 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-02-17 4:37 Stephen Rothwell
2012-02-09 4:14 Stephen Rothwell
2012-02-09 6:29 ` Grant Likely
2012-02-09 22:25 ` Will Deacon
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=20120319172254.78e16fcb56fef216cc8fafac@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mgherzan@gmail.com \
--cc=rmk@arm.linux.org.uk \
--cc=rob.herring@calxeda.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®