From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the driver-core tree with the powerpc tree Date: Mon, 15 Jun 2009 23:18:49 -0700 Message-ID: <20090616061849.GA32109@kroah.com> References: <20090616155317.d1f1217e.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from kroah.org ([198.145.64.141]:34052 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760693AbZFPGYO (ORCPT ); Tue, 16 Jun 2009 02:24:14 -0400 Content-Disposition: inline In-Reply-To: <20090616155317.d1f1217e.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Roel Kluin , Benjamin Herrenschmidt , ppc-dev On Tue, Jun 16, 2009 at 03:53:17PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/block/ps3disk.c between commits > 6dee2c87ebbe5d7ce8c4c163966a0bd9c02c75ef ("block/ps3: remove driver_data > direct access of struct device") and > 03fa68c245cccbcb99035cbabaa13b408ba91ab5 ("ps3: shorten ps3_system_bus_ > [gs]et_driver_data to ps3_system_bus_[gs]et_drvdata") from the powerpc > tree and commit db7afa200c4ef6823a2a40e4ea1dd747775be01a ("block/ps3: > remove driver_data direct access of struct device") from the driver-core > tree. > > I fixed it up (I used the version from the powerpc tree). Greg, I think > the driver-core patch is no longer relevant. I pushed out an update a number of hours ago (like 6+), so you should have gotten it with this update. When did you pull from my tree? I also just sent a merge request to Linus, so everything should be fixed up now. thanks, greg k-h From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id D6561B70C6 for ; Tue, 16 Jun 2009 16:24:20 +1000 (EST) Received: from coco.kroah.org (kroah.org [198.145.64.141]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "coco.kroah.org", Issuer "Greg KH" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 7D14CDDDA1 for ; Tue, 16 Jun 2009 16:24:20 +1000 (EST) Date: Mon, 15 Jun 2009 23:18:49 -0700 From: Greg KH To: Stephen Rothwell Subject: Re: linux-next: manual merge of the driver-core tree with the powerpc tree Message-ID: <20090616061849.GA32109@kroah.com> References: <20090616155317.d1f1217e.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20090616155317.d1f1217e.sfr@canb.auug.org.au> Cc: Roel Kluin , linux-kernel@vger.kernel.org, ppc-dev , linux-next@vger.kernel.org, Geert Uytterhoeven List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, Jun 16, 2009 at 03:53:17PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/block/ps3disk.c between commits > 6dee2c87ebbe5d7ce8c4c163966a0bd9c02c75ef ("block/ps3: remove driver_data > direct access of struct device") and > 03fa68c245cccbcb99035cbabaa13b408ba91ab5 ("ps3: shorten ps3_system_bus_ > [gs]et_driver_data to ps3_system_bus_[gs]et_drvdata") from the powerpc > tree and commit db7afa200c4ef6823a2a40e4ea1dd747775be01a ("block/ps3: > remove driver_data direct access of struct device") from the driver-core > tree. > > I fixed it up (I used the version from the powerpc tree). Greg, I think > the driver-core patch is no longer relevant. I pushed out an update a number of hours ago (like 6+), so you should have gotten it with this update. When did you pull from my tree? I also just sent a merge request to Linus, so everything should be fixed up now. thanks, greg k-h