* linux-next: manual merge of the driver-core tree with the scsi tree
@ 2009-06-09 9:04 Stephen Rothwell
2009-06-09 10:18 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-06-09 9:04 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Brian King, James Bottomley
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/scsi/ibmvscsi/ibmvscsi.c between commit
126c5cc37e682e7c5ae96754994b1cb50c2d0cb5 ("[SCSI] ibmvscsi: Add support
for capabilities MAD") from the scsi tree and commit
1e87031283511c775454ecd57f16a1a2de30aafa ("ibmvscsi: gadget: at91_udc:
remove driver_data direct access of struct device") from the driver-core
tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/scsi/ibmvscsi/ibmvscsi.c
index 11d2602,ae5ed2b..0000000
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@@ -1968,8 -1740,7 +1968,8 @@@ static int ibmvscsi_probe(struct vio_de
static int ibmvscsi_remove(struct vio_dev *vdev)
{
- struct ibmvscsi_host_data *hostdata = vdev->dev.driver_data;
+ struct ibmvscsi_host_data *hostdata = dev_get_drvdata(&vdev->dev);
+ unmap_persist_bufs(hostdata);
release_event_pool(&hostdata->pool, hostdata);
ibmvscsi_ops->release_crq_queue(&hostdata->queue, hostdata,
max_events);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the scsi tree
2009-06-09 9:04 linux-next: manual merge of the driver-core tree with the scsi tree Stephen Rothwell
@ 2009-06-09 10:18 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2009-06-09 10:18 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Brian King, James Bottomley
On Tue, Jun 09, 2009 at 07:04:15PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/scsi/ibmvscsi/ibmvscsi.c between commit
> 126c5cc37e682e7c5ae96754994b1cb50c2d0cb5 ("[SCSI] ibmvscsi: Add support
> for capabilities MAD") from the scsi tree and commit
> 1e87031283511c775454ecd57f16a1a2de30aafa ("ibmvscsi: gadget: at91_udc:
> remove driver_data direct access of struct device") from the driver-core
> tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
The fix looks fine, thanks for doing this.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-09 10:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-09 9:04 linux-next: manual merge of the driver-core tree with the scsi tree Stephen Rothwell
2009-06-09 10:18 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).