* linux-next: powerpc/drivers-core merge conflict
@ 2008-06-10 6:44 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-06-10 6:44 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, Paul Mackerras, linuxppc-dev, Kay Sievers
[-- Attachment #1: Type: text/plain, Size: 957 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-10 6:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-10 6:44 linux-next: powerpc/drivers-core merge conflict Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).