Messages in this thread | | | Date | Fri, 14 Mar 2014 09:00:02 -0400 | From | Tejun Heo <> | Subject | Re: linux-next: build failure after merge of the driver-core tree |
| |
Hello,
On Fri, Mar 14, 2014 at 09:14:55AM +1100, Benjamin Herrenschmidt wrote: > On Thu, 2014-03-13 at 11:37 +1100, Benjamin Herrenschmidt wrote: > > On Wed, 2014-03-12 at 16:21 -0400, Tejun Heo wrote: > > > It's a series of rather complex patches. I really don't think > > > duplicating them is a good idea. We can either resurrect the old API > > > to kill it again or set up a merge branch which I don't think is too > > > unusual in situations like this. > > > > Right, a topic branch that gets merged in both driver-core-next and > > powerpc-next. > > Just want to make sure we agree ... ie, the offending commit is already > in powerpc-next on my side and I can't really back it out (I could > revert it though).
Hmmm... reverting may be an option too but I don't think fixing it retroactively in a new branch should be okay too.
Thanks.
-- tejun
| |