From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean Delvare Subject: Re: linux-next: i2c/driver-core merge conflict Date: Thu, 15 May 2008 09:58:14 +0200 Message-ID: <20080515095814.49e03731@hyperion.delvare> References: <20080515120006.b336a720.sfr@canb.auug.org.au> <20080515030942.GA1638@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from zone0.gcu-squad.org ([212.85.147.21]:43010 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756789AbYEOH6d (ORCPT ); Thu, 15 May 2008 03:58:33 -0400 In-Reply-To: <20080515030942.GA1638@kroah.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Greg KH Cc: Stephen Rothwell , linux-next@vger.kernel.org, Kay Sievers On Wed, 14 May 2008 20:09:42 -0700, Greg KH wrote: > On Thu, May 15, 2008 at 12:00:06PM +1000, Stephen Rothwell wrote: > > Hi Jean, Greg, > > > > Today's linux-next merge of the i2c tree got a conflict in > > include/linux/i2c.h between commit > > e38c93bf253cb3176478a1943cd2306e8413d2bb ("driver core: remove > > KOBJ_NAME_LEN define") from the driver-core tree and commit > > f625810ef235a8b238427df3129792f89187c085 ("i2c: Kill the old driver > > matching scheme") from the i2c tree. The former changes the definition > > of driver_name in two places, the letter removes the definitions. I went > > with the latter. > > Thanks, that should be the correct one. Correct, thanks. Greg, note that I plan to send this patch to Linus quickly, so you will have to adjust your patch (i.e. simply remove the linux/i2c.h chunks that no longer apply) for 2.6.26-rc3. -- Jean Delvare