powerpc.git merge status

powerpc.git merge status

[Benjamin Herrenschmidt]

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 :-)

Cheers,
Ben.

Re: powerpc.git merge status

[Grant Likely]

On Tue, Jul 15, 2008 at 12:02 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> If you believe I've missed something, now is time to be vocal about
> it :-)

I've also got some SPI stuff, but it depends on a commit in another
tree so I'll wait until it's in Linus' tree before I ask you to pull.

Thanks,
g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Re: powerpc.git merge status

[Benjamin Herrenschmidt]

On Tue, 2008-07-15 at 00:16 -0600, Grant Likely wrote:
> On Tue, Jul 15, 2008 at 12:02 AM, Benjamin Herrenschmidt
> <benh@kernel.crashing.org> wrote:
> > If you believe I've missed something, now is time to be vocal about
> > it :-)
> 
> I've also got some SPI stuff, but it depends on a commit in another
> tree so I'll wait until it's in Linus' tree before I ask you to pull.

Ok.

Cheers,
Ben

Re: powerpc.git merge status

[Anton Vorontsov]

On Tue, Jul 15, 2008 at 04:02:09PM +1000, Benjamin Herrenschmidt wrote:
[...]
> If you believe I've missed something, now is time to be vocal about
> it :-)

Yes, this one is lost:

[OF] of_gpio: should use new <linux/gpio.h> header
http://patchwork.ozlabs.org/linuxppc/patch?id=18750


Thanks,

-- 
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2

Re: powerpc.git merge status

[Benjamin Herrenschmidt]

On Tue, 2008-07-15 at 15:39 +0400, Anton Vorontsov wrote:
> On Tue, Jul 15, 2008 at 04:02:09PM +1000, Benjamin Herrenschmidt wrote:
> [...]
> > If you believe I've missed something, now is time to be vocal about
> > it :-)
> 
> Yes, this one is lost:
> 
> [OF] of_gpio: should use new <linux/gpio.h> header
> http://patchwork.ozlabs.org/linuxppc/patch?id=18750

Is that supposed to go via the powerpc tree or is there a GPIO tree ? Is
there a GPIO maintainer that should ack it first ?

I know it's a trivial patch but I don't want to start maintainer clashes
right away :-)

Cheers,
Ben.

Re: powerpc.git merge status

[Josh Boyer]

On Tue, 2008-07-15 at 16:02 +1000, Benjamin Herrenschmidt wrote:
> Now, regarding the remaining bits, still on my todo for the next batch,
> probably later this week, in this merge window:

<snip>

> 	- Kumar PTE bits... that's a bit "hot" for this merge window
>           but I suppose it can still make it.

I'd argue that they should make it.  It's parity with your PTE rework
for 44x, and Kumar even found a bug (which you've pulled the fix for) in
your implementation :).

josh

Re: powerpc.git merge status

[Kumar Gala]

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