linux-next: manual merge of the genesis tree with Linus' tree

linux-next: manual merge of the genesis tree with Linus' tree

[Stephen Rothwell]

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

Hi Paul,

Today's linux-next merge of the genesis tree got a conflict in
arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig
arch/arm/configs/g4evm_defconfig between commit
07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from
Linus' tree and commits 4a539a2023fd2f7384916ef6e7777ad234a00dcd ("ARM:
mach-shmobile: update defconfigs") and
1ddb76fd29da170d77d70b94cdcba74b0d935152 ("ARM: mach-shmobile: update
ap4evb defconfig for MMC/DMA changes") from the genesis tree.

The changes are far to extensive for me to fix up, so I have used the
versions from the genesis tree for today.

Paul you should merge in Linus' tree (or rebase) and use Uwe's script on
your updated config files ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the genesis tree with Linus' tree

[Paul Mundt]

On Tue, Jul 13, 2010 at 11:28:14AM +1000, Stephen Rothwell wrote:
> Hi Paul,
> 
> Today's linux-next merge of the genesis tree got a conflict in
> arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig
> arch/arm/configs/g4evm_defconfig between commit
> 07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from
> Linus' tree and commits 4a539a2023fd2f7384916ef6e7777ad234a00dcd ("ARM:
> mach-shmobile: update defconfigs") and
> 1ddb76fd29da170d77d70b94cdcba74b0d935152 ("ARM: mach-shmobile: update
> ap4evb defconfig for MMC/DMA changes") from the genesis tree.
> 
> The changes are far to extensive for me to fix up, so I have used the
> versions from the genesis tree for today.
> 
> Paul you should merge in Linus' tree (or rebase) and use Uwe's script on
> your updated config files ...
> 
I'll take care of it today, sorry for the trouble!

linux-next: manual merge of the genesis tree with Linus' tree

[Stephen Rothwell]

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

Hi Paul,

Today's linux-next merge of the genesis tree got a conflict in
drivers/net/irda/sh_irda.c between commit
752ef8b541da2606c5668dcc176e7b16dd68b945 ("drivers: irda: fix sign bug")
from Linus' tree and commit 8a2b6beffc88b83089845d72eed2ed74eb5c9b1e
("net/irda/sh_irda: Modify clk_get lookups") from the genesis tree.

Just context changes.  I fixed it up (trivially) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/irda/sh_irda.c
index edd5666,9db7084..0000000
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c

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