From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ferruh Yigit <ferruh.yigit@intel.com>
Subject: Re: [PATCH 22/29] ixgbe/base: add bypassing VLVF
Date: Mon, 13 Jun 2016 15:46:08 +0100
Message-ID: <575EC730.7040505@intel.com>
References: <1462514861-29419-1-git-send-email-beilei.xing@intel.com>
 <1462514861-29419-23-git-send-email-beilei.xing@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable
Cc: dev@dpdk.org
To: Beilei Xing <beilei.xing@intel.com>, helin.zhang@intel.com
Return-path: <dev-bounces@dpdk.org>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
 by dpdk.org (Postfix) with ESMTP id 543152BB3
 for <dev@dpdk.org>; Mon, 13 Jun 2016 16:46:11 +0200 (CEST)
In-Reply-To: <1462514861-29419-23-git-send-email-beilei.xing@intel.com>
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

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.
>=20
> Signed-off-by: Beilei Xing <beilei.xing@intel.com>
> ---
>  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(-)
>=20

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