Messages in this thread | | | Date | Wed, 09 Apr 2008 18:55:42 +0200 | From | Stefan Richter <> | Subject | Re: 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/
| |