From patchwork Fri Sep 6 01:01:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 2854329 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3CF509F494 for ; Fri, 6 Sep 2013 01:03:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25A6D202B9 for ; Fri, 6 Sep 2013 01:03:02 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2A906202AE for ; Fri, 6 Sep 2013 01:03:01 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VHkRp-0001M8-8e; Fri, 06 Sep 2013 01:02:53 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VHkRn-0005cs-4R; Fri, 06 Sep 2013 01:02:51 +0000 Received: from mail-pa0-f41.google.com ([209.85.220.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VHkRj-0005bQ-So for linux-arm-kernel@lists.infradead.org; Fri, 06 Sep 2013 01:02:48 +0000 Received: by mail-pa0-f41.google.com with SMTP id bj1so2648237pad.14 for ; Thu, 05 Sep 2013 18:02:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PT74tHVT7p4dnaXuURDhnLpg9XE3+4dWBeC18C00Uzs=; b=KVGr1PxNZDpuMcNh0oyu6f017QE14JBTgxRORqLWWJWKBsvsCLHukoj4WZxlZBNrK/ ROOnGxtwDtHLJtaDWc4qb/f/BDrVmCl+LMP+XBujtucSywDKJJ2cobXlH9Mkhb2F3lh+ 0Gir9AOydRvGhhCfkkISwqI7yXJod0CjnivaVlgiyx/OvOFcJeOqZX2qVtEVgMz+S+Wq 0x0hQTmXBLKp6a4vN2MayRRCPCiZk3hyYcZ2qEEvo2YgMUP0KPP4Io+a9yAmF/GTcvYe 1mYQoaZcsIRVHqxc2wi2rTB2drBUDtKQ1rGpTAiZ+NVxaMzBczobgrWJp/zu5k9ojUul qesA== X-Gm-Message-State: ALoCoQkOhE+ANYQ9J6WWw2j8s2ag0PPih8wkdYRYhZnaU+DOzsQ7tjqc9yftUXN/NwlbKJj8TaHa X-Received: by 10.68.137.1 with SMTP id qe1mr12392345pbb.25.1378429344498; Thu, 05 Sep 2013 18:02:24 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id fy4sm38562134pbb.1.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Sep 2013 18:02:23 -0700 (PDT) From: Olof Johansson To: torvalds@linux-foundation.org Subject: [PATCH] net: stmmac: fix bad merge conflict resolution Date: Thu, 5 Sep 2013 18:01:41 -0700 Message-Id: <1378429301-19964-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.8.1.192.gc4361b8 In-Reply-To: <20130905.163725.106795517693348522.davem@davemloft.net> References: <20130905.163725.106795517693348522.davem@davemloft.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130905_210248_034717_36C7F83B X-CRM114-Status: GOOD ( 10.32 ) X-Spam-Score: -2.6 (--) Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Olof Johansson , akpm@linux-foundation.org, davem@davemloft.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Merge commit 06c54055bebf919249aa1eb68312887c3cfe77b4 did a bad conflict resolution accidentally leaving out a closing brace. Add it back. Signed-off-by: Olof Johansson --- This breaks a handful of defconfigs on ARM, so it'd be good to see it applied pretty quickly. Thanks! -Olof drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 7a00720..51c9069 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -87,6 +87,7 @@ static int stmmac_probe_config_dt(struct platform_device *pdev, if (plat->force_thresh_dma_mode) { plat->force_sf_dma_mode = 0; pr_warn("force_sf_dma_mode is ignored if force_thresh_dma_mode is set."); + } return 0; }