Stephen Rothwell wrote:
quoted text
> 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.
...
quoted text
> 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/
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/