linux-next: manual merge of the slave-dma tree with thedriver-core.current tree

[Stephen Rothwell]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/ioat/dma_v3.c between commit b9016739011f ("Drivers: dma:
remove __dev* attributes") from the driver-core.current tree and commit
370e97b07d80 ("ioat: Add alignment workaround for IVB platforms") from
the slave-dma tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/dma/ioat/dma_v3.c
index e5fc944,e52cf1e..0000000
--- a/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@@ -1187,7 -1224,27 +1224,27 @@@ static bool is_snb_ioat(struct pci_dev 
  	}
  }
  
+ static bool is_ivb_ioat(struct pci_dev *pdev)
+ {
+ 	switch (pdev->device) {
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB0:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB1:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB2:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB3:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB4:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB5:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB6:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB7:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB8:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB9:
+ 		return true;
+ 	default:
+ 		return false;
+ 	}
+ 
+ }
+ 
 -int __devinit ioat3_dma_probe(struct ioatdma_device *device, int dca)
 +int ioat3_dma_probe(struct ioatdma_device *device, int dca)
  {
  	struct pci_dev *pdev = device->pdev;
  	int dca_en = system_has_dca_enabled(pdev);

Attachment: pgp00000.pgp
Description: PGP signature