lkml.org 
[lkml]   [2015]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the arc tree with Linus' tree
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


\
 
 \ /
  Last update: 2015-06-26 08:01    [W:0.085 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site