From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <bruce.richardson@intel.com>
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
 by dpdk.org (Postfix) with ESMTP id A07A2ADE0
 for <dev@dpdk.org>; Wed,  8 Jun 2016 15:18:56 +0200 (CEST)
Received: from orsmga002.jf.intel.com ([10.7.209.21])
 by fmsmga104.fm.intel.com with ESMTP; 08 Jun 2016 06:18:43 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.26,439,1459839600"; d="scan'208";a="993528830"
Received: from bricha3-mobl3.ger.corp.intel.com ([10.237.220.95])
 by orsmga002.jf.intel.com with SMTP; 08 Jun 2016 06:18:40 -0700
Received: by  (sSMTP sendmail emulation); Wed, 08 Jun 2016 14:18:39 +0025
Date: Wed, 8 Jun 2016 14:18:39 +0100
From: Bruce Richardson <bruce.richardson@intel.com>
To: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Cc: Ferruh Yigit <ferruh.yigit@intel.com>, dev@dpdk.org,
 thomas.monjalon@6wind.com, Slawomir Rosek <slawomir.rosek@semihalf.com>
Message-ID: <20160608131839.GB24744@bricha3-MOBL3>
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>
 <57580AC3.2060805@intel.com>
 <20160608122713.GA4176@localhost.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160608122713.GA4176@localhost.localdomain>
Organization: Intel Research and =?iso-8859-1?Q?De=ACvel?=
 =?iso-8859-1?Q?opment?= Ireland Ltd.
User-Agent: Mutt/1.5.23 (2014-03-12)
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 13:18:57 -0000

On Wed, Jun 08, 2016 at 05:57:16PM +0530, Jerin Jacob wrote:
> On Wed, Jun 08, 2016 at 01:08:35PM +0100, Ferruh Yigit wrote:
> > 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
> 
> Hi Ferruh,
> 
> Since docs files are files keep changing, this patch set
> has been re-based on latest change-set i.e ca173a909538a2f1082cd0dcb4d778a97dab69c3
> not origin/rel_16_07.
>

The nic overview.rst doc causes lots of conflicts when merging, and those
I just fix on apply. There is no need to do a new patch revision solely for that.

So nothing to see here, move along... :-)

Regards,
/Bruce