From: "Dmitry Kravkov" <dmitry@broadcom.com>
To: Thierry Reding <thierry.reding@gmail.com>,
Russell King <rmk@arm.linux.org.uk>,
Merav Sicron <meravs@broadcom.com>,
David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: linux-next: manual merge of the arm tree
Date: Fri, 25 Oct 2013 15:20:40 +0000 [thread overview]
Message-ID: <504C9EFCA2D0054393414C9CB605C37F20DDD3E1@SJEXCHMB06.corp.ad.broadcom.com> (raw)
In-Reply-To: <1382454517-4074-2-git-send-email-treding@nvidia.com>
> -----Original Message-----
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of Thierry Reding
> Sent: Tuesday, October 22, 2013 6:09 PM
> To: Russell King; Merav Sicron; David Miller; netdev@vger.kernel.org
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org
> 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@broadcom.com>
next prev parent reply other threads:[~2013-10-25 15:20 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the arm tree Thierry Reding
2013-10-25 15:20 ` Dmitry Kravkov [this message]
2013-10-22 15:08 ` linux-next: manual merge of the ipsec-next tere Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
2013-10-22 18:02 ` Srinivas Pandruvada
2013-10-22 19:24 ` linux-next: Tree for Oct 22 Guenter Roeck
2013-10-22 22:04 ` linux-next: Tree for Oct 22 (xilinx_uartps) Randy Dunlap
2013-10-23 7:04 ` Greg Kroah-Hartman
2013-10-22 22:36 ` linux-next: Tree for Oct 22 (crypto/asymmetric_keys/rsa.c) Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 2:27 linux-next: manual merge of the arm tree Stephen Rothwell
2008-10-14 7:59 ` Russell King
2008-10-14 8:07 ` David Brownell
2008-10-14 20:08 ` Tony Lindgren
2008-08-25 1:03 Stephen Rothwell
2008-08-26 22:20 ` Russell King
2008-08-26 23:43 ` Stephen Rothwell
2008-07-10 4:33 Stephen Rothwell
2008-07-10 6:29 ` pHilipp Zabel
2008-07-10 7:30 ` Russell King
2008-07-04 6:57 Stephen Rothwell
2008-07-07 9:12 ` Russell King
2008-07-07 10:39 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=504C9EFCA2D0054393414C9CB605C37F20DDD3E1@SJEXCHMB06.corp.ad.broadcom.com \
--to=dmitry@broadcom.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=meravs@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).