From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stephen Warren <swarren@nvidia.com>
Cc: Erik Gilling <konkers@android.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Marc Zyngier <marc.zyngier@arm.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the tegra tree with the tree
Date: Fri, 9 Dec 2011 16:45:37 +1100 [thread overview]
Message-ID: <20111209164537.8739df79c3a1733dea4295af@canb.auug.org.au> (raw)
In-Reply-To: <4EE1907F.5000003@nvidia.com>
[-- Attachment #1: Type: text/plain, Size: 597 bytes --]
Hi Stephen,
On Thu, 08 Dec 2011 21:37:19 -0700 Stephen Warren <swarren@nvidia.com> wrote:
>
> I'm not very familiar with git diff for merge conflicts, so I might be
> wrong here, but I did reproduce this conflict to investigate, and I
> think your fixup isn't quite correct.
>
> I think you're left with two separate copies of the macro
> arch_ret_to_user, and your conflict resolution diff should be more like
> that below:
Good catch! I have fixed it up for next time.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2011-12-09 5:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-09 0:47 linux-next: manual merge of the tegra tree with the tree Stephen Rothwell
2011-12-09 4:37 ` Stephen Warren
2011-12-09 5:45 ` Stephen Rothwell [this message]
2012-09-12 6:43 Stephen Rothwell
2012-09-12 16:12 ` Greg KH
2012-09-12 16:14 ` Stephen Warren
2013-01-09 2:58 Stephen Rothwell
2013-01-09 11:48 ` Will Deacon
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=20111209164537.8739df79c3a1733dea4295af@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ccross@android.com \
--cc=konkers@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=olof@lixom.net \
--cc=rmk@arm.linux.org.uk \
--cc=swarren@nvidia.com \
/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).