On Thu, Jun 09, 2016 at 03:14:41PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> kernel/rcu/tree.c
>
> between commit:
>
> 6428671bae97 ("locking/mutex: Optimize mutex_trylock() fast-path")
>
> from the tip tree and commit:
>
> 3991b105efd5 ("rcu: Move expedited code from tree.c to tree_exp.h")
>
> from the rcu tree.
>
> I fixed it up (I used tree.c from the rcu tree and then applied the
> following fic up patch) and can carry the fix as necessary. This is now
> fixed as far as linux-next is concerned, but any non trivial conflicts
> should be mentioned to your upstream maintainer when your tree is
> submitted for merging. You may also want to consider cooperating with
> the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> From: Stephen Rothwell <[email protected]>
> Date: Thu, 9 Jun 2016 15:01:10 +1000
> Subject: [PATCH] rcu: merge fix for kernel/rcu/tree_exp.h
>
> Signed-off-by: Stephen Rothwell <[email protected]>
Looks correct to me, thank you!
Thanx, Paul
> ---
> kernel/rcu/tree_exp.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h
> index d400434af6b2..6d86ab6ec2c9 100644
> --- a/kernel/rcu/tree_exp.h
> +++ b/kernel/rcu/tree_exp.h
> @@ -253,7 +253,6 @@ static bool exp_funnel_lock(struct rcu_state *rsp,
> unsigned long s)
> if (ULONG_CMP_LT(READ_ONCE(rnp->exp_seq_rq), s) &&
> (rnp == rnp_root ||
> ULONG_CMP_LT(READ_ONCE(rnp_root->exp_seq_rq), s)) &&
> - !mutex_is_locked(&rsp->exp_mutex) &&
> mutex_trylock(&rsp->exp_mutex))
> goto fastpath;
>
> --
> 2.8.1
>
> --
> Cheers,
> Stephen Rothwell
>
