please pull the powerpc-merge.git tree

[Benjamin Herrenschmidt]

On Fri, 2005-11-11 at 13:30 -0800, Linus Torvalds wrote:
> 
> On Sat, 12 Nov 2005, Benjamin Herrenschmidt wrote:
> > 
> > Oops, my fault, I didn't test old ppc64. I'll do a patch fixing ppc64
> > later today. Note however that we really don't want to continue
> > supporting ARCH=ppc64 in 2.6.15, you should really be using powerpc :)
> 
> Hey, feel free to make the Makefile turn "ppc64" into "powerpc" and fixing 
> it that way. That's what all the other platforms do:
> 
> 	SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
> 	                                  -e s/arm.*/arm/ -e s/sa110/arm/ \
> 	                                  -e s/s390x/s390/ -e s/parisc64/parisc/ )
> 
> but if so, you should get rid of the old non-working ppc64 too.

Yes, well, that's what Paul asked you a couple of days ago :) Wether you
will give us a few more days after the official 2 weeks limit to finish
merging the remaining bits that are still in arch/ppc64 and
include/asm-ppc64 and remove arch/ppc64 completely or not :) Hopefully,
we should be able to be over sometimes next week.

I'll pop to work later this morning and get a patch for these error,
I'll let paul decide what to do with the main Makefile.

Ben