From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>
Subject: Re: linux-next: manual merge of the arc tree with Linus' tree
Date: Fri, 26 Jun 2015 11:21:42 +0530 [thread overview]
Message-ID: <558CE86E.8040006@synopsys.com> (raw)
In-Reply-To: <20150626094751.3c5a6490@canb.auug.org.au>
On Friday 26 June 2015 05:17 AM, Stephen Rothwell wrote:
> Hi Vineet,
>
> Today's linux-next merge of the arc tree got a conflict in:
>
> include/asm-generic/barrier.h
>
> between commits:
>
> ab3f02fc2372 ("locking/arch: Add WRITE_ONCE() to set_mb()")
> b92b8b35a2e3 ("locking/arch: Rename set_mb() to smp_store_mb()")
>
> from Linus' tree and commit:
>
> 470c27e4695a ("arch: conditionally define smp_{mb,rmb,wmb}")
>
> from the arc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
LGTM.
Thx Stephan.
-Vineet
prev parent reply other threads:[~2015-06-26 5:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-25 23:47 linux-next: manual merge of the arc tree with Linus' tree Stephen Rothwell
2015-06-26 5:51 ` Vineet Gupta [this message]
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=558CE86E.8040006@synopsys.com \
--to=vineet.gupta1@synopsys.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
/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).