Re: linux-next: manual merge of the arc tree with Linus' tree

[Vineet Gupta]

On Friday 26 June 2015 05:17 AM, Stephen Rothwell wrote:
> Hi Vineet,
> 
> Today's linux-next merge of the arc tree got a conflict in:
> 
>   include/asm-generic/barrier.h
> 
> between commits:
> 
>   ab3f02fc2372 ("locking/arch: Add WRITE_ONCE() to set_mb()")
>   b92b8b35a2e3 ("locking/arch: Rename set_mb() to smp_store_mb()")
> 
> from Linus' tree and commit:
> 
>   470c27e4695a ("arch: conditionally define smp_{mb,rmb,wmb}")
> 
> from the arc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 


LGTM.

Thx Stephan.

-Vineet
--
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/