Please pull from 'for-2.6.28' branch

Please pull from 'for-2.6.28' branch

[Kumar Gala]

Please pull from 'for-2.6.28' branch of

	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.28

to receive the following updates:

 Documentation/powerpc/booting-without-of.txt     |    2 ++
 Documentation/powerpc/dts-bindings/fsl/board.txt |    4 ++--
 arch/powerpc/Kconfig                             |    3 ---
 arch/powerpc/boot/dts/mpc832x_mds.dts            |    2 +-
 arch/powerpc/boot/dts/mpc834x_mds.dts            |    2 +-
 arch/powerpc/boot/dts/mpc836x_mds.dts            |    2 +-
 arch/powerpc/boot/dts/mpc8536ds.dts              |   12 ++++++------
 arch/powerpc/boot/dts/mpc8568mds.dts             |    2 +-
 arch/powerpc/include/asm/page.h                  |    5 ++++-
 arch/powerpc/kernel/prom_init_check.sh           |    2 +-
 drivers/i2c/busses/i2c-cpm.c                     |    1 -
 drivers/of/of_spi.c                              |    2 ++
 12 files changed, 21 insertions(+), 18 deletions(-)

Anton Vorontsov (1):
      powerpc: remove device_type = "board-control"

Ed Swarthout (1):
      powerpc/85xx: Fix mpc8536ds dma interrupt numbers

Jason Jin (1):
      powerpc/85xx: Enable enhanced functions for 8536 TSEC

Kumar Gala (2):
      powerpc: Fix build issue with CONFIG_RELOCATABLE=y
      powerpc: Remove Kconfig support for PPC_MERGE

Wolfgang Ocker (1):
      OF: SPI: specify chip select active high

Wolfram Sang (1):
      i2c-cpm: Suppress autoprobing for devices

Re: Please pull from 'for-2.6.28' branch

[Anton Vorontsov]

Hi Kumar,

On Mon, Oct 20, 2008 at 01:04:36PM -0500, Kumar Gala wrote:
> Please pull from 'for-2.6.28' branch of
> 
> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.28

Could you tell the status of this patch?

[1/4] powerpc/QE: implement QE Pin Multiplexing API
http://patchwork.ozlabs.org/patch/4897/

I reposted it several times (w/o changes), received no comments.
If it's ok, could you merge it for 2.6.28?

Thanks,

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

Re: Please pull from 'for-2.6.28' branch

[Kumar Gala]

On Oct 20, 2008, at 2:17 PM, Anton Vorontsov wrote:

> Hi Kumar,
>
> On Mon, Oct 20, 2008 at 01:04:36PM -0500, Kumar Gala wrote:
>> Please pull from 'for-2.6.28' branch of
>>
>> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
>> for-2.6.28
>
> Could you tell the status of this patch?
>
> [1/4] powerpc/QE: implement QE Pin Multiplexing API
> http://patchwork.ozlabs.org/patch/4897/
>
> I reposted it several times (w/o changes), received no comments.
> If it's ok, could you merge it for 2.6.28?

Sorry, I was thinking this patch required an OF interface change  
getting accepted... is that true?

- k

Re: Please pull from 'for-2.6.28' branch

[Anton Vorontsov]

On Mon, Oct 20, 2008 at 02:32:21PM -0500, Kumar Gala wrote:
>
> On Oct 20, 2008, at 2:17 PM, Anton Vorontsov wrote:
>
>> Hi Kumar,
>>
>> On Mon, Oct 20, 2008 at 01:04:36PM -0500, Kumar Gala wrote:
>>> Please pull from 'for-2.6.28' branch of
>>>
>>> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
>>> for-2.6.28
>>
>> Could you tell the status of this patch?
>>
>> [1/4] powerpc/QE: implement QE Pin Multiplexing API
>> http://patchwork.ozlabs.org/patch/4897/
>>
>> I reposted it several times (w/o changes), received no comments.
>> If it's ok, could you merge it for 2.6.28?
>
> Sorry, I was thinking this patch required an OF interface change getting 
> accepted... is that true?

Benjamin merged the OF patch, it's in the Linus' tree already.

Thanks,

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

Re: Please pull from 'for-2.6.28' branch

[Anton Vorontsov]

On Tue, Oct 21, 2008 at 12:47:37AM +0400, Anton Vorontsov wrote:
> On Mon, Oct 20, 2008 at 02:32:21PM -0500, Kumar Gala wrote:
> >
> > On Oct 20, 2008, at 2:17 PM, Anton Vorontsov wrote:
> >
> >> Hi Kumar,
> >>
> >> On Mon, Oct 20, 2008 at 01:04:36PM -0500, Kumar Gala wrote:
> >>> Please pull from 'for-2.6.28' branch of
> >>>
> >>> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
> >>> for-2.6.28
> >>
> >> Could you tell the status of this patch?
> >>
> >> [1/4] powerpc/QE: implement QE Pin Multiplexing API
> >> http://patchwork.ozlabs.org/patch/4897/
> >>
> >> I reposted it several times (w/o changes), received no comments.
> >> If it's ok, could you merge it for 2.6.28?
> >
> > Sorry, I was thinking this patch required an OF interface change getting 
> > accepted... is that true?
> 
> Benjamin merged the OF patch, it's in the Linus' tree already.

Maybe I was unclear... The OF interface change was accepted,
so the QE pinmux patch doesn't depend on anything.. Thus, can we
please merge the patch? It is needed for the FHCI USB driver,
which I still hope could get in into the 2.6.28-rc2, since it
is self-sufficient new feature that can't break anything.

Thanks and sorry for the annoyance,

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

Re: Please pull from 'for-2.6.28' branch

[Kumar Gala]

On Oct 21, 2008, at 9:41 AM, Anton Vorontsov wrote:

>
> Maybe I was unclear... The OF interface change was accepted,
> so the QE pinmux patch doesn't depend on anything.. Thus, can we
> please merge the patch? It is needed for the FHCI USB driver,
> which I still hope could get in into the 2.6.28-rc2, since it
> is self-sufficient new feature that can't break anything.
>
> Thanks and sorry for the annoyance,

I understood, just haven't had time to look at these patches.  I don't  
know if this is likely to make it into 2.6.28.

- k

Re: Please pull from 'for-2.6.28' branch

[Timur Tabi]

On Tue, Oct 21, 2008 at 9:49 AM, Kumar Gala <galak@kernel.crashing.org> wrote:
> I understood, just haven't had time to look at these patches.  I don't know
> if this is likely to make it into 2.6.28.

I ack'd the QE library portions of these patches back in April.  Sure,
a lot has changed since then, but what's the point of having a merge
window if you don't actually merge the code?

-- 
Timur Tabi
Linux kernel developer at Freescale

Re: Please pull from 'for-2.6.28' branch

[Kumar Gala]

On Oct 21, 2008, at 10:35 AM, Timur Tabi wrote:

> On Tue, Oct 21, 2008 at 9:49 AM, Kumar Gala  
> <galak@kernel.crashing.org> wrote:
>> I understood, just haven't had time to look at these patches.  I  
>> don't know
>> if this is likely to make it into 2.6.28.
>
> I ack'd the QE library portions of these patches back in April.  Sure,
> a lot has changed since then, but what's the point of having a merge
> window if you don't actually merge the code?

The point is to attempt to get code merged.  There is only so much a  
maintainer can do during or before the window.  The fact that Ben had  
issues with the OF patch caused me to ignore this change until that  
got resolved.  Since that was resolved close to the merge window this  
particular set of patches suffered.

- k

Re: Please pull from 'for-2.6.28' branch

[Benjamin Herrenschmidt]

On Mon, 2008-10-20 at 13:04 -0500, Kumar Gala wrote:
> Please pull from 'for-2.6.28' branch of
> 
> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.28

It would be nice if you didn't create new branches all the time so I
don't have to change my git remotes config :-)

Anyway, I'll add that one for now.

Cheers,
Ben.

> to receive the following updates:
> 
>  Documentation/powerpc/booting-without-of.txt     |    2 ++
>  Documentation/powerpc/dts-bindings/fsl/board.txt |    4 ++--
>  arch/powerpc/Kconfig                             |    3 ---
>  arch/powerpc/boot/dts/mpc832x_mds.dts            |    2 +-
>  arch/powerpc/boot/dts/mpc834x_mds.dts            |    2 +-
>  arch/powerpc/boot/dts/mpc836x_mds.dts            |    2 +-
>  arch/powerpc/boot/dts/mpc8536ds.dts              |   12 ++++++------
>  arch/powerpc/boot/dts/mpc8568mds.dts             |    2 +-
>  arch/powerpc/include/asm/page.h                  |    5 ++++-
>  arch/powerpc/kernel/prom_init_check.sh           |    2 +-
>  drivers/i2c/busses/i2c-cpm.c                     |    1 -
>  drivers/of/of_spi.c                              |    2 ++
>  12 files changed, 21 insertions(+), 18 deletions(-)
> 
> Anton Vorontsov (1):
>       powerpc: remove device_type = "board-control"
> 
> Ed Swarthout (1):
>       powerpc/85xx: Fix mpc8536ds dma interrupt numbers
> 
> Jason Jin (1):
>       powerpc/85xx: Enable enhanced functions for 8536 TSEC
> 
> Kumar Gala (2):
>       powerpc: Fix build issue with CONFIG_RELOCATABLE=y
>       powerpc: Remove Kconfig support for PPC_MERGE
> 
> Wolfgang Ocker (1):
>       OF: SPI: specify chip select active high
> 
> Wolfram Sang (1):
>       i2c-cpm: Suppress autoprobing for devices

Re: Please pull from 'for-2.6.28' branch

[Kumar Gala]

On Oct 20, 2008, at 6:29 PM, Benjamin Herrenschmidt wrote:

> On Mon, 2008-10-20 at 13:04 -0500, Kumar Gala wrote:
>> Please pull from 'for-2.6.28' branch of
>>
>> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
>> for-2.6.28
>
> It would be nice if you didn't create new branches all the time so I
> don't have to change my git remotes config :-)
>
> Anyway, I'll add that one for now.
>
> Cheers,
> Ben.

That fine, but its a bit annoying having to deal with this two headed  
PPC maintainership.  Paul had certain things he would do things and  
you have certain ways you'd like to see things.   I understand that,  
but its a tad schizophrenic on a sub-maintainer.

- k

Re: Please pull from 'for-2.6.28' branch

[Benjamin Herrenschmidt]

On Mon, 2008-10-20 at 13:04 -0500, Kumar Gala wrote:
> Please pull from 'for-2.6.28' branch of
> 
> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.28
> 
> to receive the following updates:

Argh, that's not based on my current powerpc, if you needed me to move
fwd, please ask first. It makes it harder for me to properly review and
make sure merges are clean if, when I pull josh, grant and your trees,
they don't all nicely base on my current tree.

Cheers,
Ben.

Re: Please pull from 'for-2.6.28' branch

[Kumar Gala]

On Oct 20, 2008, at 6:37 PM, Benjamin Herrenschmidt wrote:

> On Mon, 2008-10-20 at 13:04 -0500, Kumar Gala wrote:
>> Please pull from 'for-2.6.28' branch of
>>
>> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
>> for-2.6.28
>>
>> to receive the following updates:
>
> Argh, that's not based on my current powerpc, if you needed me to move
> fwd, please ask first. It makes it harder for me to properly review  
> and
> make sure merges are clean if, when I pull josh, grant and your trees,
> they don't all nicely base on my current tree.

It wasn't needed, but I've done this with Paul in the past w/o any  
issue.  I'll make sure to poke you in the future if needed.

- k

Re: Please pull from 'for-2.6.28' branch

[Benjamin Herrenschmidt]

On Mon, 2008-10-20 at 13:04 -0500, Kumar Gala wrote:
> Please pull from 'for-2.6.28' branch of
> 
> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for-2.6.28
> 
> to receive the following updates:

Ok so I'm not too happy. Kumar, you need to be a little bit more careful
with your git tree. Here are a few things that are causing me problems
at the moment and making me not pull this one. Some of them I already
sent separate emails for but let's put it all together:

 - First, please try to keep a consistent merge branch. Even if it ends
up merging separate branches from you internally.

 - Please use git request-pull or at least provide me with the merge
base in the email if it's not my current master or next HEAD, and since
it makes my life a bit harder too, please try to have your tree based on
mine unless you have some conflicts to sort out.

 - Please spend a bit more time cleaning up the cset subjects and
comments. For example:

	"powerpc: remove device_type = "boad_control"

There are a few problems with this one. Not everybody knows what
"device_type" is, it's not obvious that it's a device-tree change, and
you may notice that I've been trying to keep the first character after
the category: uppercase. I would have preferred something like:

	powerpc: Remove device_type = "board_control" properties in .dts files

Another one that doesn't pass my criteria is:

	OF: SPI: specify chip select active high

I don't like caps, and it's not the generally accepted format. It should
be something like:

	of/spi: Provide a way to specify chip select polarity

Nicer heh ?

I almost always rewrite subjects and sometimes fixup descriptions when I
merge patches. Please do so too.

 - Finally, the Kconfig change shouldn't have been in your tree at all,
or at least not without my or paulus ack and prior argeement that it
should be merged that way. No big deal with this obviously correct
patch but where do we put the limit ?

Cheers,
Ben.
   

Re: Please pull from 'for-2.6.28' branch

[Benjamin Herrenschmidt]

>  - Finally, the Kconfig change shouldn't have been in your tree at all,
> or at least not without my or paulus ack and prior argeement that it
> should be merged that way. No big deal with this obviously correct
> patch but where do we put the limit ?

Same with the CONFIG_RELOCATABLE build fix. I'll pick both from
patchwork into my bundle for linus and they shouldn't go through
your tree unless prior approval.

Cheers,
Ben.

Re: Please pull from 'for-2.6.28' branch

[Kumar Gala]

On Oct 20, 2008, at 7:11 PM, Benjamin Herrenschmidt wrote:

> On Mon, 2008-10-20 at 13:04 -0500, Kumar Gala wrote:
>> Please pull from 'for-2.6.28' branch of
>>
>> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git  
>> for-2.6.28
>>
>> to receive the following updates:
>
> Ok so I'm not too happy. Kumar, you need to be a little bit more  
> careful
> with your git tree. Here are a few things that are causing me problems
> at the moment and making me not pull this one. Some of them I already
> sent separate emails for but let's put it all together:
>
> - First, please try to keep a consistent merge branch. Even if it ends
> up merging separate branches from you internally.

Yeah, I got the message.

> - Please use git request-pull or at least provide me with the merge
> base in the email if it's not my current master or next HEAD, and  
> since
> it makes my life a bit harder too, please try to have your tree  
> based on
> mine unless you have some conflicts to sort out.

will do.

> - Please spend a bit more time cleaning up the cset subjects and
> comments. For example:
>
> 	"powerpc: remove device_type = "boad_control"
>
> There are a few problems with this one. Not everybody knows what
> "device_type" is, it's not obvious that it's a device-tree change, and
> you may notice that I've been trying to keep the first character after
> the category: uppercase. I would have preferred something like:
>
> 	powerpc: Remove device_type = "board_control" properties in .dts  
> files
>
> Another one that doesn't pass my criteria is:
>
> 	OF: SPI: specify chip select active high
>
> I don't like caps, and it's not the generally accepted format. It  
> should
> be something like:
>
> 	of/spi: Provide a way to specify chip select polarity
>
> Nicer heh ?

If you had conventions on naming this is the first I've heard of  
them.  I know Paul asked about the [POWERPC] to powerpc: change on list.

> I almost always rewrite subjects and sometimes fixup descriptions  
> when I
> merge patches. Please do so too.

I do so as well.  As stated above, if there are naming conventions  
that are desired I'm happy to conform but just need to know what they  
are.

> - Finally, the Kconfig change shouldn't have been in your tree at all,
> or at least not without my or paulus ack and prior argeement that it
> should be merged that way. No big deal with this obviously correct
> patch but where do we put the limit ?


The limit is based on trust.  I submitted all the other cleanup  
patches to remove PPC_MERGE.  I think I can handle such a patch going  
via my tree.

- k

Re: Please pull from 'for-2.6.28' branch

[Benjamin Herrenschmidt]

On Mon, 2008-10-20 at 22:45 -0500, Kumar Gala wrote:
> 
> If you had conventions on naming this is the first I've heard of  
> them.  I know Paul asked about the [POWERPC] to powerpc: change on
> list.

Well, they weren't official, but others seem to have picked them up, no
big deal but heh, here now you know about them :-)

> I do so as well.  As stated above, if there are naming conventions  
> that are desired I'm happy to conform but just need to know what they
> are.

Well, my aim is mostly consistency. If you don't like what I want, I'm
happy to discuss it, but I'd like basically to keep consistency in the
naming conventions. In some cases though, my comment also refers to the
subject being a tad too vague to my taste. I know there isn't a strict
definition of what is good enough or not and we definitely don't want a
3 lines novel there, but in the case of the .dts file update, it would
have been useful to highlight that fact for example.

> The limit is based on trust.  I submitted all the other cleanup  
> patches to remove PPC_MERGE.  I think I can handle such a patch going
> via my tree.

I would have still preferred if we had discussed it before hand...

Cheers,
Ben.

Re: Please pull from 'for-2.6.28' branch

[Kumar Gala]

On Oct 20, 2008, at 10:51 PM, Benjamin Herrenschmidt wrote:

> On Mon, 2008-10-20 at 22:45 -0500, Kumar Gala wrote:
>>
>> If you had conventions on naming this is the first I've heard of
>> them.  I know Paul asked about the [POWERPC] to powerpc: change on
>> list.
>
> Well, they weren't official, but others seem to have picked them up,  
> no
> big deal but heh, here now you know about them :-)
>
>> I do so as well.  As stated above, if there are naming conventions
>> that are desired I'm happy to conform but just need to know what they
>> are.
>
> Well, my aim is mostly consistency. If you don't like what I want, I'm
> happy to discuss it, but I'd like basically to keep consistency in the
> naming conventions. In some cases though, my comment also refers to  
> the
> subject being a tad too vague to my taste. I know there isn't a strict
> definition of what is good enough or not and we definitely don't  
> want a
> 3 lines novel there, but in the case of the .dts file update, it would
> have been useful to highlight that fact for example.

As stated, I know now so I'm happy to conform.

>> The limit is based on trust.  I submitted all the other cleanup
>> patches to remove PPC_MERGE.  I think I can handle such a patch going
>> via my tree.
>
> I would have still preferred if we had discussed it before hand...

Yeah, see my previous gripe about trivial patches and my tree :)

- k