2015-06-25 23:48:09

by Stephen Rothwell

[permalink] [raw]

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

---

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).

--
Cheers,
Stephen Rothwell [email protected]

diff --cc include/asm-generic/barrier.h
index e6a83d712ef6,270b7c989ea1..000000000000
--- a/include/asm-generic/barrier.h
+++ b/include/asm-generic/barrier.h
@@@ -66,8 -89,10 +89,10 @@@
#define smp_read_barrier_depends() do { } while (0)
#endif

+ #endif
+
-#ifndef set_mb
-#define set_mb(var, value) do { (var) = (value); mb(); } while (0)
+#ifndef smp_store_mb
+#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); mb(); } while (0)
#endif

#ifndef smp_mb__before_atomic

---

Attachments:

(No filename) (819.00 B)
OpenPGP digital signature

2015-06-26 05:52:25

by Vineet Gupta

[permalink] [raw]

Subject: Re: 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