From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754632AbaCMWPQ (ORCPT ); Thu, 13 Mar 2014 18:15:16 -0400 Received: from gate.crashing.org ([63.228.1.57]:37566 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753504AbaCMWPO (ORCPT ); Thu, 13 Mar 2014 18:15:14 -0400 Message-ID: <1394748895.15098.16.camel@pasglop> Subject: Re: linux-next: build failure after merge of the driver-core tree From: Benjamin Herrenschmidt To: Tejun Heo Cc: Mark Brown , Greg KH , Stewart Smith , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 14 Mar 2014 09:14:55 +1100 In-Reply-To: <1394671056.4840.103.camel@pasglop> References: <20140312005152.9ac4063f65dbd233f5d50b4d@kernel.org> <20140312015021.GC10106@kroah.com> <1394596541.4840.70.camel@pasglop> <20140312113742.GM28112@sirena.org.uk> <1394654396.4840.94.camel@pasglop> <20140312200232.GA22332@htj.dyndns.org> <1394655292.4840.97.camel@pasglop> <20140312202102.GB22332@htj.dyndns.org> <1394671056.4840.103.camel@pasglop> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.11.90 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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). Cheers, Ben.