> -----Original Message----- > From: netdev-owner@xxxxxxxxxxxxxxx [mailto:netdev- > owner@xxxxxxxxxxxxxxx] On Behalf Of Thierry Reding > Sent: Tuesday, October 22, 2013 6:09 PM > To: Russell King; Merav Sicron; David Miller; netdev@xxxxxxxxxxxxxxx > Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx > Subject: linux-next: manual merge of the arm tree > > Today's linux-next merge of the arm tree got a conflict in > > drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c > > caused by commits 1bfa2c4 (DMA-API: net: broadcom/bnx2x: replace > dma_set_mask()+dma_set_coherent_mask() with new helper) and edd3147 > (bnx2x: Set NETIF_F_HIGHDMA unconditionally). > > I fixed it up (see below). Please verify that the resolution looks good. > > Thanks, > Thierry > --- > diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c > index b42f89c,38bf998..767aafb > --- a/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; > } The fix is correct. Thanks, Thierry. Acked-by: Dmitry Kravkov <dmitry@xxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
