linux-kernel - Re: linux-next: manual merge of the bjdooks-i2c tree with Linus' 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20110117004958.GC5432@trinity.fluff.org>
Date:	Mon, 17 Jan 2011 00:49:59 +0000
From:	Ben Dooks <ben@...nity.fluff.org>
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,
	Lennert Buytenhek <buytenh@...tstofly.org>,
	Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Subject: Re: linux-next: manual merge of the bjdooks-i2c tree with Linus'
	tree

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@...b.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@...ff.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

--
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/