mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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,
	Rob Herring <rob.herring@calxeda.com>,
	Russell King <rmk@arm.linux.org.uk>,
	Mark Salter <msalter@redhat.com>
Subject: linux-next: manual merge of the irqdomain tree with the arm tree
Date: Fri, 17 Feb 2012 15:37:49 +1100	[thread overview]
Message-ID: <20120217153749.5d77fe6bc877a0f1f4e94855@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 834 bytes --]

Hi Grant,

Today's linux-next merge of the irqdomain tree got a conflict in
arch/c6x/Kconfig between commit 2ed86b16eabe ("irq: make SPARSE_IRQ an
optionally hidden option") from the arm tree and commit 0bd761e1b6d9
("irq_domain/c6x: Convert c6x to use generic irq_domain support") 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/c6x/Kconfig
index 2f58c61,3c64b28..0000000
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@@ -11,7 -11,8 +11,8 @@@ config TMS320C6
  	select HAVE_DMA_API_DEBUG
  	select HAVE_GENERIC_HARDIRQS
  	select HAVE_MEMBLOCK
 -	select HAVE_SPARSE_IRQ
 +	select SPARSE_IRQ
+ 	select IRQ_DOMAIN
  	select OF
  	select OF_EARLY_FLATTREE
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-02-17  4:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-17  4:37 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-03-19  6:22 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=20120217153749.5d77fe6bc877a0f1f4e94855@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=msalter@redhat.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®