From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vineet Gupta <Vineet.Gupta1@synopsys•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Peter Zijlstra <peterz@infradead•org>,
Ingo Molnar <mingo@kernel•org>
Subject: linux-next: manual merge of the arc tree with Linus' tree
Date: Fri, 26 Jun 2015 09:47:51 +1000 [thread overview]
Message-ID: <20150626094751.3c5a6490@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]
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 sfr@canb•auug.org.au
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-25 23:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-25 23:47 Stephen Rothwell [this message]
2015-06-26 5:51 ` linux-next: manual merge of the arc tree with Linus' tree Vineet Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150626094751.3c5a6490@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Vineet.Gupta1@synopsys$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox