powerpc-next rebased

powerpc-next rebased

[Benjamin Herrenschmidt]

Allright it's done, let's hope I didn't screw up :-)

So I rebased the whole thing on top of latest upstream, fixing along the
way the bug that Becky found in tlb.h and fixing up a commit name from
Kumar that was referencing the wrong board. I also applied to -next the
remaining things that were in -test, except for my _PAGE_EXEC rework.

I've added a Kumar's fix for assert_pte_locked() and merged Paulus per
counter callchain support while at it

I also pushed out an updated -test with the new variant of the
_PAGE_EXEC rework and a couple more things hanging off patchwork, I'll
probably add a bit more such as the pending iommu bits tomorrow.

Cheers,
Ben.

Re: powerpc-next rebased

[Kumar Gala]

On Aug 19, 2009, at 2:33 AM, Benjamin Herrenschmidt wrote:

> Allright it's done, let's hope I didn't screw up :-)

You screwed it up... :)

The commits you pulled in from me you seem to have changed the author  
of the commits which is NOT cool at all.  Adding signed-off-by is  
good, changing the committer is ok, but changing the author of the  
commit is not.  Please fix this ASAP.

Here's an example (in your tree):

http://git.kernel.org/?p=linux/kernel/git/benh/powerpc.git;a=commitdiff;h=87f1e94c949c28fdaa079d5115a8010c9a40569d

vs the commit in my tree:

http://git.kernel.org/?p=linux/kernel/git/galak/powerpc.git;a=commit;h=d920991f7e02788ba2b468b3023e5bbbc7a32f30

- k

Re: powerpc-next rebased

[Kumar Gala]

On Aug 19, 2009, at 8:43 AM, Kumar Gala wrote:

>
> On Aug 19, 2009, at 2:33 AM, Benjamin Herrenschmidt wrote:
>
>> Allright it's done, let's hope I didn't screw up :-)
>
> You screwed it up... :)
>
> The commits you pulled in from me you seem to have changed the  
> author of the commits which is NOT cool at all.  Adding signed-off- 
> by is good, changing the committer is ok, but changing the author of  
> the commit is not.  Please fix this ASAP.
>
> Here's an example (in your tree):
>
> http://git.kernel.org/?p=linux/kernel/git/benh/powerpc.git;a=commitdiff;h=87f1e94c949c28fdaa079d5115a8010c9a40569d
>
> vs the commit in my tree:
>
> http://git.kernel.org/?p=linux/kernel/git/galak/powerpc.git;a=commit;h=d920991f7e02788ba2b468b3023e5bbbc7a32f30

I'll leave my tree alone to allow you to try and fix this.  It looks  
like the stuff you pulled in from Josh's tree also has similar foobar.

- k

Re: powerpc-next rebased

[Kumar Gala]

On Aug 19, 2009, at 8:54 AM, Kumar Gala wrote:

>
> On Aug 19, 2009, at 8:43 AM, Kumar Gala wrote:
>
>>
>> On Aug 19, 2009, at 2:33 AM, Benjamin Herrenschmidt wrote:
>>
>>> Allright it's done, let's hope I didn't screw up :-)
>>
>> You screwed it up... :)
>>
>> The commits you pulled in from me you seem to have changed the  
>> author of the commits which is NOT cool at all.  Adding signed-off- 
>> by is good, changing the committer is ok, but changing the author  
>> of the commit is not.  Please fix this ASAP.
>>
>> Here's an example (in your tree):
>>
>> http://git.kernel.org/?p=linux/kernel/git/benh/powerpc.git;a=commitdiff;h=87f1e94c949c28fdaa079d5115a8010c9a40569d
>>
>> vs the commit in my tree:
>>
>> http://git.kernel.org/?p=linux/kernel/git/galak/powerpc.git;a=commit;h=d920991f7e02788ba2b468b3023e5bbbc7a32f30
>
> I'll leave my tree alone to allow you to try and fix this.  It looks  
> like the stuff you pulled in from Josh's tree also has similar foobar.
>
> - k

To be nice I published a 'fix-author' branch on my kernel.org tree  
that should be identical to your tree up to:

commit b045513a1d657178868a1b1c5c2c56b7ef67766d
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Tue Aug 18 15:21:40 2009 +0000

     powerpc/mm: Fix assert_pte_locked to work properly on uniprocessor

     Since the pte_lockptr is a spinlock it gets optimized away on
     uniprocessor builds so using spin_is_locked is not correct.  We  
can use
     assert_spin_locked instead and get the proper behavior between UP  
and
     SMP builds.

     Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
     Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

I doesn't have any Signed-off-by from you for the commits from Josh or  
I.  Otherwise the Author's have been fixed.

- k

Re: powerpc-next rebased

[Benjamin Herrenschmidt]

On Wed, 2009-08-19 at 08:43 -0500, Kumar Gala wrote:
> 
> You screwed it up... :)
> 
> The commits you pulled in from me you seem to have changed the
> author  
> of the commits which is NOT cool at all.  Adding signed-off-by is  
> good, changing the committer is ok, but changing the author of the  
> commit is not.  Please fix this ASAP.

Strange. I just rebased and ammended them, I didn't think that would
change the author :-( I'll try to figure out what went wrong and will
fix it up.

Cheers,
Ben.

> Here's an example (in your tree):
> 
> http://git.kernel.org/?p=linux/kernel/git/benh/powerpc.git;a=commitdiff;h=87f1e94c949c28fdaa079d5115a8010c9a40569d
> 
> vs the commit in my tree:
> 
> http://git.kernel.org/?p=linux/kernel/git/galak/powerpc.git;a=commit;h=d920991f7e02788ba2b468b3023e5bbbc7a32f30

powerpc-next rebased (again)

[Benjamin Herrenschmidt]

Ok so due to screwup mentioned earlier, it's rebased agian :-(

Hopefully that's the last time for very looooooong...

While at it, I removed the lmb kmemleak patch from Michael since
we decided it wasn't a good idea and added Kumar's fix for
assert_pte_locked().

I also updated the test branch with more stuff such as Fujita
IOMMU bits and pieces.

Cheers,
Ben.