lkml.org 
[lkml]   [2008]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for April 9
Stephen Rothwell wrote:
> There were a few merge conflicts (fairly trivial) and couple of build
> failures (notified). There is a know build failure with powerpc
> allyesconfig. Below is a summary of the state of the merge.
...
> Merging ieee1394/for-next
> CONFLICT (content): Merge conflict in lib/Kconfig.debug

Would it be safe for me (and preferred by you) to merge sched/for-akpm
into ieee1394/for-next to resolve this conflict until next mainline merge?
--
Stefan Richter
-=====-==--- -=-- -=--=
http://arcgraph.de/sr/


\
 
 \ /
  Last update: 2008-04-09 18:59    [W:0.101 / U:22.588 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site