linux-next: powerpc/drivers-core merge conflict

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the powerpc tree got a conflict in
arch/ppc/syslib/ppc_sys.c, arch/ppc/platforms/cpci690.c,
arch/ppc/platforms/ev64260.c, arch/ppc/platforms/ev64360.c,
arch/ppc/platforms/hdpu.c, arch/ppc/platforms/katana.c, and
arch/ppc/platforms/radstone_ppc7d.c between commit
09a99031899ba31e43545b9876fb29c3709f21b3 ("driver-core: prepare for
removal of 20 char limit from struct device") from the driver-core tree
and commit ecc688ed0470015664987e23138c7e6355de31b9 ("powerpc: Remove
arch/ppc and include/asm-ppc") from the powerpc tree.

Obviously, the later commit removes the files modified by the former.  I
would guess that you can now remove the parts of the driver-core patch
that would affect those files.  I don't think it will matter if arch/ppc
doesn't build for part of the next merge window.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20080610/ceb49b3a/attachment.pgp>