From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Chris Zankel <chris@zankel•net>,
Catalin Marinas <catalin.marinas@arm•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Max Filippov <jcmvbkbc@gmail•com>
Subject: linux-next: manual merge of the xtensa tree with the arm64 and tip trees
Date: Mon, 24 Aug 2015 11:10:54 +1000 [thread overview]
Message-ID: <20150824111054.4bad5fba@canb.auug.org.au> (raw)
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in:
arch/xtensa/include/asm/atomic.h
between commit:
2a3ed90f428c ("xtensa: Provide atomic_{or,xor,and}")
from the arm64 and tip trees and commit:
38fef73c21d1 ("xtensa: implement fake NMI")
from the xtensa tree.
I fixed it up (I dropped the latter's definitions of
atomic_{set,clear}_mask) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
reply other threads:[~2015-08-24 1:10 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=20150824111054.4bad5fba@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chris@zankel$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=jcmvbkbc@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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