Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/edac/amd8111_edac.c b/drivers/edac/amd8111_edac.c
index 2cb58ef743e0..35b78d04bbfa 100644
--- a/drivers/edac/amd8111_edac.c
+++ b/drivers/edac/amd8111_edac.c
@@ -37,7 +37,6 @@
 #define AMD8111_EDAC_MOD_STR    "amd8111_edac"
 
 #define PCI_DEVICE_ID_AMD_8111_PCI      0x7460
-static int edac_dev_idx;
 
 enum amd8111_edac_devs {
         LPC_BRIDGE = 0,
@@ -377,7 +376,7 @@ static int amd8111_dev_probe(struct pci_dev *dev,
          * edac_device_ctl_info, but make use of existing
          * one instead.
         */
-        dev_info->edac_idx = edac_dev_idx++;
+        dev_info->edac_idx = edac_device_alloc_index();
         dev_info->edac_dev =
                 edac_device_alloc_ctl_info(0, dev_info->ctl_name, 1,
                                            NULL, 0, 0,