Messages in this thread | | | Date | Mon, 15 Jun 2009 23:18:49 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the powerpc tree |
| |
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
| |