Hi Arnd,
Today's linux-next merge of the asm-generic tree got a conflict in
include/asm-generic/atomic.h between commit
53e111a730ea8b002d57dd226098c12789993329 ("x86: Fix atomic_long_xchg() on
64bit") from Linus' tree and commit
72099ed2719fc5829bd79c6ca9d1783ed026eb37 ("asm-generic: rename atomic.h
to atomic-long.h") from the asm-generic tree.
I applied the fix from the former patch to atomic-long.h
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpwOhzHz3OT2.pgp
Description: PGP signature
