* linux-next: manual merge of the xtensa tree with the arm64 and tip trees
@ 2015-08-24 1:10 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-08-24 1:10 UTC (permalink / raw)
To: Chris Zankel, Catalin Marinas, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Max Filippov
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in:
arch/xtensa/include/asm/atomic.h
between commit:
2a3ed90f428c ("xtensa: Provide atomic_{or,xor,and}")
from the arm64 and tip trees and commit:
38fef73c21d1 ("xtensa: implement fake NMI")
from the xtensa tree.
I fixed it up (I dropped the latter's definitions of
atomic_{set,clear}_mask) 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-24 1:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-24 1:10 linux-next: manual merge of the xtensa tree with the arm64 and tip trees Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox