linux-kernel - Re: linux-next: manual merge of the bjdooks-i2c tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <AANLkTi=SmAOxTKmP5w-GKbx1mEDAXAJs7Cv58tRV-AOk@mail.gmail.com>
Date:	Thu, 6 Jan 2011 11:29:15 +0800
From:	Eric Miao <eric.y.miao@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Ben Dooks <ben-linux@...ff.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Russell King <rmk@....linux.org.uk>,
	Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
	Dirk Brandewie <dirk.brandewie@...il.com>,
	Marek Vasut <marek.vasut@...il.com>
Subject: Re: linux-next: manual merge of the bjdooks-i2c tree with the arm tree

On Thu, Jan 6, 2011 at 10:31 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Ben,
>
> Today's linux-next merge of the bjdooks-i2c tree got a conflict in
> arch/arm/mach-pxa/pxa27x.c, arch/arm/mach-pxa/pxa3xx.c and
> arch/arm/mach-pxa/trizeps4.c between commit
> ad68bb9f7a3cd47396635a5e3895215af57579da ("ARM: pxa: Access SMEMC via
> virtual addresses") from the arm 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.

Thanks Stephen, that looks sane to me.

> --
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
>
> diff --cc arch/arm/mach-pxa/pxa27x.c
> index b2130b7,1c77e89..0000000
> --- a/arch/arm/mach-pxa/pxa27x.c
> +++ b/arch/arm/mach-pxa/pxa27x.c
> @@@ -17,9 -17,8 +17,10 @@@
>  #include <linux/suspend.h>
>  #include <linux/platform_device.h>
>  #include <linux/sysdev.h>
>  +#include <linux/io.h>
> + #include <linux/i2c/pxa-i2c.h>
>
>  +#include <asm/mach/map.h>
>  #include <mach/hardware.h>
>  #include <asm/irq.h>
>  #include <mach/irqs.h>
> @@@ -29,10 -28,7 +30,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"
> diff --cc arch/arm/mach-pxa/pxa3xx.c
> index e14818f,c9d9729..0000000
> --- a/arch/arm/mach-pxa/pxa3xx.c
> +++ b/arch/arm/mach-pxa/pxa3xx.c
> @@@ -21,8 -21,8 +21,9 @@@
>  #include <linux/irq.h>
>  #include <linux/io.h>
>  #include <linux/sysdev.h>
> + #include <linux/i2c/pxa-i2c.h>
>
>  +#include <asm/mach/map.h>
>  #include <mach/hardware.h>
>  #include <mach/gpio.h>
>  #include <mach/pxa3xx-regs.h>
> @@@ -31,8 -31,6 +32,7 @@@
>  #include <mach/pm.h>
>  #include <mach/dma.h>
>  #include <mach/regs-intc.h>
>  +#include <mach/smemc.h>
> - #include <plat/i2c.h>
>
>  #include "generic.h"
>  #include "devices.h"
> diff --cc arch/arm/mach-pxa/trizeps4.c
> index 43fc9ca,995e671..0000000
> --- a/arch/arm/mach-pxa/trizeps4.c
> +++ b/arch/arm/mach-pxa/trizeps4.c
> @@@ -47,8 -47,6 +47,7 @@@
>  #include <mach/mmc.h>
>  #include <mach/irda.h>
>  #include <mach/ohci.h>
>  +#include <mach/smemc.h>
> - #include <plat/i2c.h>
>
>  #include "generic.h"
>  #include "devices.h"
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/