From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762081AbZCZX00 (ORCPT ); Thu, 26 Mar 2009 19:26:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762007AbZCZXZx (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" 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 Content-Type: text/plain; charset=us-ascii X-OriginalArrivalTime: 26 Mar 2009 23:25:49.0805 (UTC) FILETIME=[32C111D0:01C9AE6A] Authentication-Results: sj-dkim-2; header.From=rdreier@cisco.com; dkim=pass ( sig from cisco.com/sjdkim2002 verified; ); Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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. --- > 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(-) 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;