From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 543152BB3 for ; Mon, 13 Jun 2016 16:46:11 +0200 (CEST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP; 13 Jun 2016 07:46:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,466,1459839600"; d="scan'208";a="120990573" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.220.87]) ([10.237.220.87]) by fmsmga004.fm.intel.com with ESMTP; 13 Jun 2016 07:46:09 -0700 To: Beilei Xing , helin.zhang@intel.com References: <1462514861-29419-1-git-send-email-beilei.xing@intel.com> <1462514861-29419-23-git-send-email-beilei.xing@intel.com> Cc: dev@dpdk.org From: Ferruh Yigit Message-ID: <575EC730.7040505@intel.com> Date: Mon, 13 Jun 2016 15:46:08 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <1462514861-29419-23-git-send-email-beilei.xing@intel.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH 22/29] ixgbe/base: add bypassing VLVF X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jun 2016 14:46:11 -0000 On 5/6/2016 7:07 AM, Beilei Xing wrote: > This patch adds support for the VLVF to be bypassed when adding or > removing a VFTA entry. The PF can utilize the default pool while > preserving the VLVF for the VFs use. > Meanwhile, update corresponding VF ops and drivers where corresponding > ops is invoked. > > Signed-off-by: Beilei Xing > --- > drivers/net/ixgbe/base/ixgbe_82598.c | 5 ++- > drivers/net/ixgbe/base/ixgbe_82598.h | 3 +- > drivers/net/ixgbe/base/ixgbe_api.c | 11 ++++-- > drivers/net/ixgbe/base/ixgbe_api.h | 5 ++- > drivers/net/ixgbe/base/ixgbe_common.c | 71 +++++++++++++++++++---------------- > drivers/net/ixgbe/base/ixgbe_common.h | 7 ++-- > drivers/net/ixgbe/base/ixgbe_type.h | 5 ++- > drivers/net/ixgbe/base/ixgbe_vf.c | 6 ++- > drivers/net/ixgbe/base/ixgbe_vf.h | 3 +- > drivers/net/ixgbe/ixgbe_ethdev.c | 11 ++++-- > drivers/net/ixgbe/ixgbe_pf.c | 2 +- > 11 files changed, 76 insertions(+), 53 deletions(-) > Hi Beilei, This patch failing to apply to latest dpdk-next-net/rel_16_07 Applying: ixgbe/base: add bypassing VLVF Using index info to reconstruct a base tree... M drivers/net/ixgbe/ixgbe_ethdev.c M drivers/net/ixgbe/ixgbe_pf.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/ixgbe/ixgbe_pf.c Auto-merging drivers/net/ixgbe/ixgbe_ethdev.c CONFLICT (content): Merge conflict in drivers/net/ixgbe/ixgbe_ethdev.c Failed to merge in the changes. Patch failed at 0001 ixgbe/base: add bypassing VLVF