Hi all, Today's linux-next merge of the tip tree got conflicts in:
include/linux/compiler.h
between commits:
dee081bf8f82 ("READ_ONCE: Drop pointer qualifiers when reading from scalar
types")
9e343b467c70 ("READ_ONCE: Enforce atomicity for {READ,WRITE}_ONCE() memory
accesses")
a5460b5e5fb8 ("READ_ONCE: Simplify implementations of {READ,WRITE}_ONCE()")
from Linus' tree and commits:
2ab3a0a02905 ("READ_ONCE: Enforce atomicity for {READ,WRITE}_ONCE() memory
accesses")
7b364f0949ae ("READ_ONCE: Drop pointer qualifiers when reading from scalar
types")
bbfa112b46bd ("READ_ONCE: Simplify implementations of {READ,WRITE}_ONCE()")
(and maybe others)
from the tip tree.
I fixed it up (I think - please check the final result when I release it)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgpwfGNqlsdKb.pgp
Description: OpenPGP digital signature
