please pull the powerpc-merge.git tree

[Benjamin Herrenschmidt]

> Well, since right now ppc64 doesn't work at all, I think that's pretty 
> moot ;/
> 
> Since building with "make ARCH=powerpc" _does_ work for me, and since the 
> biggest section of ppc64 machines by far would likely be G5's and other 
> machines where that merge is tested, I think the thing to do is just call 
> it a fait accompli, and just say that ppc64 is dead.

Yes, but we still have to move some files over from arch/ppc64 and
include/asm-ppc64 (even building with ARCH=powerpc does get some files
from there, at least until they are completely emptied).

It's mostly just moving things over except for a couple of ones that
need to be actually merged.

Note that all machines supported by ppc64 are now supported by powerpc.
In fact, all of the platform code has been in arch/powerpc/platforms for
some time now.

> But I was going to release a -rc1 today (unless Andrew), and I do want 
> things to just "work". So for me the question there is whether I just do 
> the one-liner Makefile thing to force "ppc64" -> "powerpc", or whether you 
> can get me a quick patch that gets ppc64 going again.

Ok, just do the one liner in the Makefile then.

> I don't care terribly which way it goes, and if ppc64 ends up disabled in 
> -rc1 and dying off entirely during -rc2, that's ok by me.

Ok.

> But if it's enabled in -rc1, then I want it enabled in the final too. I 
> don't want to kill a sub-arch after -rc1, that would be against the whole 
> point of the modern definition of -rc1.

Ok, disable it then.

> So kill it off now, or kill it off after 2.6.15, that's what the choice 
> boils down to. 

It's dead :)

Ben.