From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Borntraeger <borntraeger@de•ibm.com>,
Catalin Marinas <catalin.marinas@arm•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andrey Konovalov <andreyknvl@google•com>,
Ingo Molnar <mingo@kernel•org>,
"Peter Zijlstra (Intel)" <peterz@infradead•org>,
Will Deacon <will.deacon@arm•com>
Subject: linux-next: manual merge of the access_once tree with the arm64 tree
Date: Wed, 5 Aug 2015 14:41:39 +1000 [thread overview]
Message-ID: <20150805144139.575dbda7@canb.auug.org.au> (raw)
Hi Christian,
Today's linux-next merge of the access_once tree got a conflict in:
arch/arm64/include/asm/barrier.h
between commit:
4b3dc9679cf7 ("arm64: force CONFIG_SMP=y and remove redundant #ifdefs")
from the arm64 tree and commit:
76695af20c01 ("locking, arch: use WRITE_ONCE()/READ_ONCE() in smp_store_release()/smp_load_acquire()")
from the access_once tree.
I fixed it up (the former removed the code modified by the latter, so I
just did that) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
reply other threads:[~2015-08-05 4:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150805144139.575dbda7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andreyknvl@google$(echo .)com \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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