From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ferruh.yigit@intel.com>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
 by dpdk.org (Postfix) with ESMTP id 9BA6DADAA
 for <dev@dpdk.org>; Wed,  8 Jun 2016 14:08:38 +0200 (CEST)
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
 by fmsmga101.fm.intel.com with ESMTP; 08 Jun 2016 05:08:37 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.26,438,1459839600"; d="scan'208";a="983315095"
Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.221.53])
 ([10.237.221.53])
 by fmsmga001.fm.intel.com with ESMTP; 08 Jun 2016 05:08:36 -0700
To: Jerin Jacob <jerin.jacob@caviumnetworks.com>, dev@dpdk.org
References: <1464540424-12631-1-git-send-email-jerin.jacob@caviumnetworks.com>
 <1465317632-11471-1-git-send-email-jerin.jacob@caviumnetworks.com>
 <1465317632-11471-20-git-send-email-jerin.jacob@caviumnetworks.com>
Cc: thomas.monjalon@6wind.com, bruce.richardson@intel.com,
 Slawomir Rosek <slawomir.rosek@semihalf.com>
From: Ferruh Yigit <ferruh.yigit@intel.com>
Message-ID: <57580AC3.2060805@intel.com>
Date: Wed, 8 Jun 2016 13:08:35 +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: <1465317632-11471-20-git-send-email-jerin.jacob@caviumnetworks.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [dpdk-dev] [PATCH v3 19/20] thunderx/nicvf: updated driver
 documentation and release notes
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
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>
X-List-Received-Date: Wed, 08 Jun 2016 12:08:39 -0000

On 6/7/2016 5:40 PM, Jerin Jacob wrote:
> Updated doc/guides/nics/overview.rst, doc/guides/nics/thunderx.rst
> and release notes
> 
> Changed "*" to "P" in overview.rst to capture the partially supported
> feature as "*" creating alignment issues with Sphinx table
> 
> Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> Signed-off-by: Slawomir Rosek <slawomir.rosek@semihalf.com>
> Acked-by: John McNamara <john.mcnamara@intel.com>
> ---
>  doc/guides/nics/index.rst              |   1 +
>  doc/guides/nics/overview.rst           |  96 ++++-----
>  doc/guides/nics/thunderx.rst           | 354 +++++++++++++++++++++++++++++++++
>  doc/guides/rel_notes/release_16_07.rst |   1 +
>  4 files changed, 404 insertions(+), 48 deletions(-)
>  create mode 100644 doc/guides/nics/thunderx.rst

Hi Jerin,

This patch doesn't apply on top of origin/rel_16_07:

Applying: thunderx/nicvf: updated driver documentation and release notes
Using index info to reconstruct a base tree...
M	doc/guides/nics/overview.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/nics/overview.rst
CONFLICT (content): Merge conflict in doc/guides/nics/overview.rst

Regards,
ferruh