From: Russell King <rmk@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Ian Molton <spyro@f2s.com>
Subject: Re: linux-next: manual merge of the arm tree
Date: Tue, 26 Aug 2008 23:20:44 +0100 [thread overview]
Message-ID: <20080826222044.GA17277@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20080825110348.9f5485ec.sfr@canb.auug.org.au>
On Mon, Aug 25, 2008 at 11:03:48AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/mach-pxa/include/mach/irqs.h between commit
> dec5abe9219aebf6d65e9af95de1c031d7039bdb ("[ARM] Fix eseries IRQ limit")
> from Linus' tree and commit 44b6deaa10e0b62fc6d6db0b673f8bfa61b745d1
> ("[ARM] pxa: introduce PXA_HAVE_BOARD_IRQS") from the arm tree.
I think you're seeing that because of my devel branch having multiple
common ancestors. I've rebased most of the work in there so it doesn't
suffer from that problem, and it should resolve your problem.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2008-08-26 22:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-25 1:03 linux-next: manual merge of the arm tree Stephen Rothwell
2008-08-26 22:20 ` Russell King [this message]
2008-08-26 23:43 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the arm tree Thierry Reding
2013-10-25 15:20 ` Dmitry Kravkov
2008-10-14 2:27 Stephen Rothwell
2008-10-14 7:59 ` Russell King
2008-10-14 8:07 ` David Brownell
2008-10-14 20:08 ` Tony Lindgren
2008-07-10 4:33 Stephen Rothwell
2008-07-10 6:29 ` pHilipp Zabel
2008-07-10 7:30 ` Russell King
2008-07-04 6:57 Stephen Rothwell
2008-07-07 9:12 ` Russell King
2008-07-07 10:39 ` 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=20080826222044.GA17277@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=spyro@f2s.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;
as well as URLs for NNTP newsgroup(s).