From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the driver-core tree Date: Tue, 22 Jul 2008 21:21:23 -0700 Message-ID: <20080723042123.GA6738@kroah.com> References: <20080723113135.5e22bf4d.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from bombadil.infradead.org ([18.85.46.34]:36773 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750915AbYGWEci (ORCPT ); Wed, 23 Jul 2008 00:32:38 -0400 Content-Disposition: inline In-Reply-To: <20080723113135.5e22bf4d.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, Alan Cox , David Howells On Wed, Jul 23, 2008 at 11:31:35AM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got conflicts in 58 > files due to the partial merge into Linus' tree of the driver-core tree. > The conflicts were all caused by the renamed of device_create_drvdata() > to device_create() so I took the driver-core versions of almost all those > files. The exceptions were drivers/char/tty_io.c, > drivers/char/istallion.c, drivers/char/stallion.c and > drivers/isdn/capi/capi.c which required a manual merge (I applied the > rename by hand on top of the upstream version of the file in each case). > Someone might like to check that I have it all right when I publish the > tree. Thanks, I'll take a look. greg k-h