From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759026AbZFIJEY (ORCPT ); Tue, 9 Jun 2009 05:04:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753909AbZFIJER (ORCPT ); Tue, 9 Jun 2009 05:04:17 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:43167 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752356AbZFIJEQ (ORCPT ); Tue, 9 Jun 2009 05:04:16 -0400 Date: Tue, 9 Jun 2009 19:04:15 +1000 From: Stephen Rothwell To: Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Brian King , James Bottomley Subject: linux-next: manual merge of the driver-core tree with the scsi tree Message-Id: <20090609190415.3bfba32d.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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);