From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Brian King <brking@linux•vnet.ibm.com>,
James Bottomley <James.Bottomley@HansenPartnership•com>
Subject: linux-next: manual merge of the driver-core tree with the scsi tree
Date: Tue, 9 Jun 2009 19:04:15 +1000 [thread overview]
Message-ID: <20090609190415.3bfba32d.sfr@canb.auug.org.au> (raw)
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);
next reply other threads:[~2009-06-09 9:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 9:04 Stephen Rothwell [this message]
2009-06-09 10:18 ` linux-next: manual merge of the driver-core tree with the scsi tree Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090609190415.3bfba32d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=brking@linux$(echo .)vnet.ibm.com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox