From: Ben Dooks <ben@trinity.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
Subject: Re: linux-next: manual merge of the samsung tree
Date: Tue, 8 Dec 2009 01:34:30 +0000 [thread overview]
Message-ID: <20091208013430.GH23152@trinity.fluff.org> (raw)
In-Reply-To: <20091208111722.2e8d9527.sfr@canb.auug.org.au>
On Tue, Dec 08, 2009 at 11:17:22AM +1100, Stephen Rothwell wrote:
> Hi Ben,
>
> In today's linux-next merge of the samsung tree I noticed that the file
> arch/arm/plat-s3c/dev-hsmmc2.c actually has some merge conflict artifacts
> in it.
>
> I fixed them up (just by using the version from the arm tree) but it
> would be good if this could be fixed in your tree as well (I notice that
> Russell has already merged a (presumable) correct version of these files).
I belive so, I've updated next-samsung from my for-rmk tree and added the
rebased new trees to it which should fix it.
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
next prev parent reply other threads:[~2009-12-08 1:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-08 0:17 linux-next: manual merge of the samsung tree Stephen Rothwell
2009-12-08 1:34 ` Ben Dooks [this message]
2009-12-08 2:46 ` 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=20091208013430.GH23152@trinity.fluff.org \
--to=ben@trinity.fluff.org \
--cc=ben-linux@fluff.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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