linux-next: manual merge of the net tree

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a trivial conflict in
drivers/net/fs_enet/fs_enet-main.c between commit
55b6c8e99d582cc66947b465d0ff3147a0219808 ("drivers/net: Use linux/of_
{device,platform}.h instead of asm") from the powerpc tree and commit
d8b35fac8c7e1b44d873c1afcc5f88bc5ef4b361 ("fs_enet: MDIO on GPIO
support") from the net tree.

I fixed it up and can carry the fixup.
(The powerpc commit just changed asm/of_platform.h to linux/of_platform.h)

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

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

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in  between
commits aee1dc73b519227084d77b0b2fc972b68b4153d8 ("[POWERPC] Update
booting-without-of for Freescale PCIe MSI") and
83ff9dcf375c418ca3b98eb950711525ca1269e2 ("powerpc/sysdev: implement FSL
GTM support") from the powerpc tree and commit
a5edeccb1a8432ae5d9fb9bccea5a4b64c565017 ("net: OpenFirmware GPIO based
MDIO bitbang driver") from the net tree.

They are just overlapping additions. I renumbered(?) the "MDIO on GPIOs"
section to 'v'.

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

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

Re: linux-next: manual merge of the net tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Jul 2008 17:19:40 +1000

> Today's linux-next merge of the net tree got a conflict
...

Thanks for the heads up on these two conflicts with the
powerpc tree.

The best seems to let you keep using your resolving, so
that's what I'll let you do :)

Re: linux-next: manual merge of the net tree

[Stephen Rothwell]

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

On Tue, 1 Jul 2008 17:19:40 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in  between
                                                             ^
Documentation/powerpc/booting-without-of.txt

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

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