linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Will Deacon <will.deacon@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the tip tree with the arm64 tree
Date: Tue, 13 Oct 2015 10:50:03 +0100	[thread overview]
Message-ID: <20151013095003.GC21550@arm.com> (raw)
In-Reply-To: <20151013131048.51f00118@canb.auug.org.au>

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

  reply	other threads:[~2015-10-13  9:50 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-13  2:10 linux-next: manual merge of the tip tree with the arm64 tree Stephen Rothwell
2015-10-13  9:50 ` Will Deacon [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-13 16:45 broonie
2021-08-27  4:09 Stephen Rothwell
2020-05-22  6:11 Stephen Rothwell
2020-03-18  4:27 Stephen Rothwell
2020-03-18  8:50 ` Catalin Marinas
2020-03-10  1:49 Stephen Rothwell
2019-04-15  4:25 Stephen Rothwell
2019-04-15  4:21 Stephen Rothwell
2017-11-01  5:47 Stephen Rothwell
2017-11-13 22:52 ` Stephen Rothwell
2017-08-22  3:38 Stephen Rothwell
2017-09-04  5:29 ` Stephen Rothwell
2017-06-16  3:25 Stephen Rothwell
2017-07-03  1:29 ` Stephen Rothwell
2017-03-31  3:02 Stephen Rothwell
2017-03-31  9:32 ` Arnd Bergmann
2017-03-31 11:24   ` Stephen Rothwell
2016-09-12  2:54 Stephen Rothwell
2016-05-12  2:00 Stephen Rothwell
2016-04-29  3:56 Stephen Rothwell
2016-04-29  9:04 ` Matt Fleming
2016-02-26  1:53 Stephen Rothwell
2016-02-26  1:53 Stephen Rothwell
2015-10-22  2:26 Stephen Rothwell
2015-10-22 12:06 ` Suzuki K. Poulose
2015-10-22 15:32   ` Catalin Marinas
2015-10-31 22:17     ` Stephen Rothwell
2015-10-15  3:05 Stephen Rothwell
2014-05-23  6:44 Stephen Rothwell
2014-05-23  9:23 ` Catalin Marinas
2014-05-23  6:28 Stephen Rothwell
2014-05-23  8:41 ` Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151013095003.GC21550@arm.com \
    --to=will.deacon@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).