* linux-next: manual merge of the samsung tree
@ 2009-12-08 0:17 Stephen Rothwell
2009-12-08 1:34 ` Ben Dooks
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-12-08 0:17 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 496 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the samsung tree
2009-12-08 0:17 linux-next: manual merge of the samsung tree Stephen Rothwell
@ 2009-12-08 1:34 ` Ben Dooks
2009-12-08 2:46 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Ben Dooks @ 2009-12-08 1:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Ben Dooks, linux-next, linux-kernel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-08 2:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-08 0:17 linux-next: manual merge of the samsung tree Stephen Rothwell
2009-12-08 1:34 ` Ben Dooks
2009-12-08 2:46 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox