Re: linux-next: manual merge of the tip tree with the arm64 tree

[Will Deacon <will.deacon@arm.com>]

On Tue, Oct 13, 2015 at 01:10:48PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/arm64/include/asm/atomic.h
> 
> between commit:
> 
>   305d454aaa29 ("arm64: atomics: implement native {relaxed, acquire, release} atomics")
> 
> from the arm64 tree and commit:
> 
>   62e8a3258bda ("atomic, arch: Audit atomic_{read,set}()")
> 
> from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm64/include/asm/atomic.h
> index 5e13ad76a249,1e247ac2601a..000000000000
> --- a/arch/arm64/include/asm/atomic.h
> +++ b/arch/arm64/include/asm/atomic.h
> @@@ -54,39 -54,8 +54,39 @@@
>   #define ATOMIC_INIT(i)	{ (i) }
>   
>   #define atomic_read(v)			READ_ONCE((v)->counter)
> - #define atomic_set(v, i)		(((v)->counter) = (i))
> + #define atomic_set(v, i)		WRITE_ONCE(((v)->counter), (i))

This is the correct fixup, and matches what I'm carrying locally.

Thanks, Stephen.

Will