Merge remote-tracking branch 'arm/for-next'

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc drivers/dma/edma.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index b42f89ce02ef5997fa46e57a9521b0873968d7b7,38bf99893c1d113b7e4ed7a19b95d00901b9e2ab..767aafb504060db4e8d7d441dc4f640865132e40
--- 1/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
--- 2/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@@ -12117,12 -12079,9 +12117,8 @@@ static int bnx2x_set_coherency_mask(str
  {
        struct device *dev = &bp->pdev->dev;
  
-       if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {
-               if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {
-                       dev_err(dev, "dma_set_coherent_mask failed, aborting\n");
-                       return -EIO;
-               }
-       } else if (dma_set_mask(dev, DMA_BIT_MASK(32)) != 0) {
 -      if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) == 0) {
 -              bp->flags |= USING_DAC_FLAG;
 -      } else if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) != 0) {
++      if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) != 0 &&
++          dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) != 0) {
                dev_err(dev, "System does not support DMA, aborting\n");
                return -EIO;
        }

diff --cc drivers/of/platform.c
Simple merge

diff --cc tools/perf/config/feature-tests.mak
Simple merge