[lkml]   [2008]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: Tree for April 9

* Stefan Richter <> wrote:

> 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?

what type of conflict do you have there? If it's a new entry then you
might be able to fix it by moving the new entry elsewhere in the file.
Or if i introduced a new entry close to an existing entry you modify
then i could move my new entry elsewhere.


 \ /
  Last update: 2008-04-10 08:55    [W:0.131 / U:1.916 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site