lkml.org 
[lkml]   [2020]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the tip tree with Linus' tree
Date
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

\
 
 \ /
  Last update: 2020-06-11 12:44    [W:0.042 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site