* linux-next: manual merge of the access_once tree with the arm64 tree
@ 2015-08-05 4:41 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-08-05 4:41 UTC (permalink / raw)
To: Christian Borntraeger, Catalin Marinas
Cc: linux-next, linux-kernel, Andrey Konovalov, Ingo Molnar,
Peter Zijlstra (Intel), Will Deacon
Hi Christian,
Today's linux-next merge of the access_once tree got a conflict in:
arch/arm64/include/asm/barrier.h
between commit:
4b3dc9679cf7 ("arm64: force CONFIG_SMP=y and remove redundant #ifdefs")
from the arm64 tree and commit:
76695af20c01 ("locking, arch: use WRITE_ONCE()/READ_ONCE() in smp_store_release()/smp_load_acquire()")
from the access_once tree.
I fixed it up (the former removed the code modified by the latter, so I
just did that) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-08-05 4:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-05 4:41 linux-next: manual merge of the access_once tree with the arm64 tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox