Messages in this thread | | | From | Thomas Gleixner <> | Subject | Re: linux-next: manual merge of the tip tree with Linus' tree | Date | Thu, 11 Jun 2020 12:43:24 +0200 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > 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.
Sorry for that inconveniance. I'm about to get rid of the conflicts on the tip side.
Thanks,
tglx
| |