lkml.org 
[lkml]   [2010]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the trivial tree with Linus' tree
On Tue, 10 Aug 2010, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/mach-omap1/board-nokia770.c between commit
> ab6f7751905e5cf713d081dbb3b97b8f6909ab34 ("Removing dead OMAP_DSP") from
> Linus' tree and commit 426d31071ac476ea62c62656b242930c17b58c00 ("fix
> printk typo 'faild'") from the trivial tree.
>
> The former removes the code that the latter is updating. So I just
> removed it.

Hi Stephen,

I have now merged Linus' master into for-next branch, so this conflict
should now be gone.

--
Jiri Kosina
SUSE Labs, Novell Inc.


\
 
 \ /
  Last update: 2010-08-10 13:25    [W:0.783 / U:1.492 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site