Re: linux-next: manual merge of the driver-core tree with the scsitree

From: Greg KH
Date: Tue Jun 09 2009 - 06:39:20 EST

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
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at