powerpc.git merge status

Kumar Gala galak at kernel.crashing.org
Tue Jul 15 22:52:44 EST 2008


On Jul 15, 2008, at 1:02 AM, Benjamin Herrenschmidt wrote:

> I've pulled from Kumar, Josh and Grant, along with applying some
> patches hand picked from patchworks and build fixes. I've merged in
> Linus as of today (minus David Woodhouse firmware patches that have a
> build breakage) in order to fix a (fairly trivial) merge conflict.
>
> I've now pushed that to my powerpc.git "master" branch for overnight
> build-testing with kisskb at which point
>
> If all goes well, I'll put all of that in "merge" and "next" and ask
> Linus to pull it tomorrow.
>
> Now, regarding the remaining bits, still on my todo for the next  
> batch,
> probably later this week, in this merge window:
>
> 	- The CMO stuff, I need to have a closer look but it should
>          probably go in
> 	- Milton's serie. Mostly fixes, haven't had time to look too
>          closely yet.
> 	- Kumar PTE bits... that's a bit "hot" for this merge window
>          but I suppose it can still make it.
> 	- Some Cell stuff for which I'm waiting a new serie from Arnd
>
> If you believe I've missed something, now is time to be vocal about
> it :-)

There are a number of patches I still need to pick up but I expect  
this to be a second round of pulling.

- k



More information about the Linuxppc-dev mailing list