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 at caviumnetworks.com> > > > Signed-off-by: Slawomir Rosek <slawomir.rosek at semihalf.com> > > > Acked-by: John McNamara <john.mcnamara at 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
