From: Ben Dooks <ben@trinity.fluff.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ben Dooks <ben-linux@fluff.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Lennert Buytenhek <buytenh@wantstofly.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: Re: linux-next: manual merge of the bjdooks-i2c tree with Linus' tree
Date: Mon, 17 Jan 2011 00:49:59 +0000 [thread overview]
Message-ID: <20110117004958.GC5432@trinity.fluff.org> (raw)
In-Reply-To: <20110117111700.7fefe690.sfr@canb.auug.org.au>
On Mon, Jan 17, 2011 at 11:17:00AM +1100, Stephen Rothwell wrote:
> Hi Ben,
>
> Today's linux-next merge of the bjdooks-i2c tree got a conflict in
> arch/arm/mach-pxa/pxa27x.c between commit
> a3f4c927d379cfaa597bc8ff75dc9d28f8d9200e ("ARM: PXA SoCs: irq_data
> conversion") from Linus' tree and commit
> 0a56f28ec486273d84d25571573908344aa67176 ("arm/pxa2xx: reorganize I2C
> files") from the bjdooks-i2c tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
>
> Ben, is that stuff going into 2.6.38? If so, please get Linus to pull it
> as it has quite a few conflicts (especially this one commit) ...
I'll check with RMK on this and sort it out tomorrow.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-pxa/pxa27x.c
> index 987301f,1c77e89..0000000
> --- a/arch/arm/mach-pxa/pxa27x.c
> +++ b/arch/arm/mach-pxa/pxa27x.c
> @@@ -17,10 -17,8 +17,11 @@@
> #include <linux/suspend.h>
> #include <linux/platform_device.h>
> #include <linux/sysdev.h>
> +#include <linux/io.h>
> +#include <linux/irq.h>
> + #include <linux/i2c/pxa-i2c.h>
>
> +#include <asm/mach/map.h>
> #include <mach/hardware.h>
> #include <asm/irq.h>
> #include <mach/irqs.h>
> @@@ -30,10 -28,7 +31,8 @@@
> #include <mach/ohci.h>
> #include <mach/pm.h>
> #include <mach/dma.h>
> +#include <mach/smemc.h>
>
> - #include <plat/i2c.h>
> -
> #include "generic.h"
> #include "devices.h"
> #include "clock.h"
--
Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/
Large Hadron Colada: A large Pina Colada that makes the universe disappear.
next prev parent reply other threads:[~2011-01-17 0:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-17 0:17 linux-next: manual merge of the bjdooks-i2c tree with Linus' tree Stephen Rothwell
2011-01-17 0:49 ` Ben Dooks [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-04-08 3:20 Stephen Rothwell
2011-11-02 1:22 Stephen Rothwell
2011-11-02 2:28 ` Yong Zhang
2011-11-02 17:46 ` Ben Dooks
2012-07-31 2:48 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=20110117004958.GC5432@trinity.fluff.org \
--to=ben@trinity.fluff.org \
--cc=ben-linux@fluff.org \
--cc=bigeasy@linutronix.de \
--cc=buytenh@wantstofly.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).