From patchwork Thu Mar 26 23:25:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Dreier X-Patchwork-Id: 25183 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id BB4B5DDE00 for ; Fri, 27 Mar 2009 10:25:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762059AbZCZXZx (ORCPT ); Thu, 26 Mar 2009 19:25:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762010AbZCZXZx (ORCPT ); Thu, 26 Mar 2009 19:25:53 -0400 Received: from sj-iport-6.cisco.com ([171.71.176.117]:20855 "EHLO sj-iport-6.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760227AbZCZXZv (ORCPT ); Thu, 26 Mar 2009 19:25:51 -0400 X-IronPort-AV: E=Sophos;i="4.38,429,1233532800"; d="scan'208";a="274965075" Received: from sj-dkim-2.cisco.com ([171.71.179.186]) by sj-iport-6.cisco.com with ESMTP; 26 Mar 2009 23:25:50 +0000 Received: from sj-core-4.cisco.com (sj-core-4.cisco.com [171.68.223.138]) by sj-dkim-2.cisco.com (8.12.11/8.12.11) with ESMTP id n2QNPonI000862; Thu, 26 Mar 2009 16:25:50 -0700 Received: from xbh-sjc-231.amer.cisco.com (xbh-sjc-231.cisco.com [128.107.191.100]) by sj-core-4.cisco.com (8.13.8/8.13.8) with ESMTP id n2QNPoa8019942; Thu, 26 Mar 2009 23:25:50 GMT Received: from xfe-sjc-212.amer.cisco.com ([171.70.151.187]) by xbh-sjc-231.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.1830); Thu, 26 Mar 2009 16:25:50 -0700 Received: from roland-conroe ([10.33.42.9]) by xfe-sjc-212.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.1830); Thu, 26 Mar 2009 16:25:49 -0700 Received: by roland-conroe (Postfix, from userid 33217) id 86B77E7206; Thu, 26 Mar 2009 16:25:49 -0700 (PDT) From: Roland Dreier To: Linus Torvalds Cc: David Miller , Andrew Morton , netdev@vger.kernel.org, Linux Kernel Mailing List Subject: RDMA/nes: Fix mis-merge References: <20090326.020714.36421849.davem@davemloft.net> <20090326.152515.43533230.davem@davemloft.net> X-Message-Flag: Warning: May contain useful information Date: Thu, 26 Mar 2009 16:25:49 -0700 In-Reply-To: (Linus Torvalds's message of "Thu, 26 Mar 2009 15:56:24 -0700 (PDT)") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) MIME-Version: 1.0 X-OriginalArrivalTime: 26 Mar 2009 23:25:49.0805 (UTC) FILETIME=[32C111D0:01C9AE6A] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; l=1315; t=1238109950; x=1238973950; c=relaxed/simple; s=sjdkim2002; h=Content-Type:From:Subject:Content-Transfer-Encoding:MIME-Version; d=cisco.com; i=rdreier@cisco.com; z=From:=20Roland=20Dreier=20 |Subject:=20RDMA/nes=3A=20Fix=20mis-merge |Sender:=20; bh=gMVclVGFKE5z+JMY/qPnDJ7XbxCUkb+KY2W3W+s7F/k=; b=UBlVJjwuVyncdvej9LhEMHIxmg2Bk1DY5wHnoM+puZvfmx2LCzI8Kno7oh OEmkk+lXWu4n7L8MvW2HUCHfQWXbDF7IGyUaBVzEmF3RvkH09lhqy34iKo4g BUT8nXb0ka; Authentication-Results: sj-dkim-2; header.From=rdreier@cisco.com; dkim=pass ( sig from cisco.com/sjdkim2002 verified; ); Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When net-next and infiniband were merged upstream, each branch deleted one of a pair of adjacent lines from nes_nic.c, but when Linus fixed the conflict up, he brought back both of the lines. Fix up to the intended final tree state. Acked-by: David S. Miller Signed-off-by: Roland Dreier --- > Well, I merged infiniband, and that caused more conflicts. I fixed them > up, but people need to double-check my fixes. Looks like you mismerged one file -- each side deleted one line right next to each other, but your merge left both lines in. I think the patch below is needed. (The cxgb3 fix looks correct) drivers/infiniband/hw/nes/nes_nic.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 8d3e4c6..ecb1f6f 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c @@ -1602,8 +1602,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev, netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128); nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n"); netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; - netdev->vlan_rx_register = nes_netdev_vlan_rx_register; - netdev->features |= NETIF_F_LLTX; /* Fill in the port structure */ nesvnic->netdev = netdev;