Re: [PATCH v9 3.2 7/9] tracing: uprobes trace_event interface

[Srikar Dronamraju]

> Srikar, rebased commits like this one:
> 
>   c5af743: rcu: Introduce raw SRCU read-side primitives
> 
> are absolutely inacceptable:
> 

Okay, I wasnt sure whats the best way for me to expose a tree such that
people who just use my tree to try (without basing on any other trees
except Linus) can build and use uprobes but people who already have this
commit arent affected by me having this commit.

So couple of people did tell me that git was intelligent enuf that if
the commit was already in, it would create a empty commit. 

do you have suggestions on how to work around such situations in future?

>  commit c5af7439f322db86e347991e184b95dd80676967
>  Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
>  Date:   Sun Oct 9 15:13:11 2011 -0700
> 
>     rcu: Introduce raw SRCU read-side primitives
> 
>     ...
> 
>     Requested-by: Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx>
>     Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
>     Tested-by: Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx>
> 
> If you pull a commit from Paul into your tree then you must 
> never rebase it. If you applied Paul's commit out of email then 
> you should add a Signed-off-by, not a Tested-by tag at the end.

I actually cherry-picked commit from your tree i.e -tip. 
The Tested-by tag was added by Paul after I confirmed to him that it
works.  Even the commit 0c53dd8b3140: that you refer has the same tags.

> 
> Also, please test whether it works when merged to latest -tip, 
> there's been various RCU changes in this area. AFAICS these 
> read-side primitives are already upstream via:
> 
>   0c53dd8b3140: rcu: Introduce raw SRCU read-side primitives
> 
> so pulling your tree would break the build.

I had used v3.2 as a base for my tree and 0c53dd8b3140: was not part of
that tag. Now that its gone into mainline, I will drop the commit.

-- 
Thanks and Regards
Srikar

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/