From: Ben Dooks <ben-linux@fluff.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ben Dooks <ben-linux@fluff.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Pannaga Bhushan <p.bhushan@samsung.com>
Subject: Re: linux-next: manual merge of the samsung tree with the tree
Date: Thu, 20 May 2010 02:46:28 +0100 [thread overview]
Message-ID: <20100520014628.GL4720@trinity.fluff.org> (raw)
In-Reply-To: <20100520110411.c16ea156.sfr@canb.auug.org.au>
On Thu, May 20, 2010 at 11:04:11AM +1000, Stephen Rothwell wrote:
> Hi Ben,
>
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/mach-s5pv210/gpiolib.c between commit
> ea5f50706385b61c1c0d24271bbe7c6e93129fbc ("ARM: S5PV210: Add GPIOlib
> support") from Linus' tree and commit
> 026fcae436e846b0cc1db8d4af11890dfdde3689 ("ARM: S5PV210: Add S5PV210 GPIO
> support") from the samsung tree.
>
> Two versions of the same commit. I used the version in Linus' tree as
> that was dated later.
sorry, the tree that went to linus had that one replaced due to a minor
bug in the GPH banks that got fixed. Decided to replace the patch than
put a patch ontop.
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
next prev parent reply other threads:[~2010-05-20 1:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-20 1:04 linux-next: manual merge of the samsung tree with the tree Stephen Rothwell
2010-05-20 1:46 ` Ben Dooks [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-23 1:20 Stephen Rothwell
2014-05-23 2:02 ` Kukjin Kim
2014-12-01 0:06 Stephen Rothwell
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=20100520014628.GL4720@trinity.fluff.org \
--to=ben-linux@fluff.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=p.bhushan@samsung.com \
--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).