Re: linux-next: Tree for April 9

[Ingo Molnar]

* Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> 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.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/