linux-doc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Jonathan Corbet <corbet@lwn.net>
Cc: "Linux Doc Mailing List" <linux-doc@vger.kernel.org>,
	"Jonathan Neuschäfer" <j.neuschaefer@gmx.net>,
	"rd.dunlab@gmail.com" <rd.dunlab@gmail.com>,
	"Corey Minyard" <cminyard@mvista.com>,
	"Harald Seiler" <hws@denx.de>,
	"Heikki Krogerus" <heikki.krogerus@linux.intel.com>,
	"Jacob Keller" <jacob.e.keller@intel.com>,
	"Jason Gunthorpe" <jgg@ziepe.ca>,
	"Michael Walle" <michael@walle.cc>,
	"Pragat Pandya" <pragat.pandya@gmail.com>,
	"Takashi Iwai" <tiwai@suse.de>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] docs: driver-api: remove a duplicated index entry
Date: Sat, 24 Oct 2020 08:45:31 +0200	[thread overview]
Message-ID: <20201024084531.33fc1b75@coco.lan> (raw)
In-Reply-To: <20201021151344.4f471fbc@lwn.net>

Em Wed, 21 Oct 2020 15:13:44 -0600
Jonathan Corbet <corbet@lwn.net> escreveu:

> On Thu, 15 Oct 2020 11:12:06 +0200
> Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote:
> 
> > The ipmb file was added twice at index.rst. That
> > sounds to be because the same patch was applied twice,
> > via different git trees:
> > 
> > 	commit f6ae22d64433fd8e08654adad7966299da931bb9
> > 	Author: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
> > 	Commit: Jonathan Corbet <corbet@lwn.net>
> > 
> > 	    docs: ipmb: place it at driver-api and convert to ReST
> > 
> > 	commit ac499fba98c3c65078fd84fa0a62cd6f6d5837ed
> > 	Author: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
> > 	Commit: Corey Minyard <cminyard@mvista.com>
> > 
> > 	    docs: ipmb: place it at driver-api and convert to ReST
> > 
> > With Sphinx 4.0.0 development tree, a new warning is produced
> > due to that:
> > 
> > 	.../Documentation/driver-api/index.rst:14: WARNING: duplicated entry found in toctree: driver-api/ipmb
> > 
> > The fix is trivial: just drop the duplicated line.
> > 
> > Fixes: f6ae22d64433 ("docs: ipmb: place it at driver-api and convert to ReST")
> > Fixes: ac499fba98c3 ("docs: ipmb: place it at driver-api and convert to ReST")
> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>  
> 
> Interesting...I wonder how applying the patch twice could lead to the line
> being inserted in two completely different locations like that?  Anyway,
> I've applied this one, hopefully nobody else will do the same :)

Probably this was due to some manual conflict resolution when applying
one of the versions of it ;-)

No big harm, and with newer Sphinx versions, we should be able 
to detect similar cases in the future.

Thanks,
Mauro

      reply	other threads:[~2020-10-24  6:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-15  9:12 [PATCH] docs: driver-api: remove a duplicated index entry Mauro Carvalho Chehab
2020-10-21 21:13 ` Jonathan Corbet
2020-10-24  6:45   ` Mauro Carvalho Chehab [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201024084531.33fc1b75@coco.lan \
    --to=mchehab+huawei@kernel.org \
    --cc=cminyard@mvista.com \
    --cc=corbet@lwn.net \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=hws@denx.de \
    --cc=j.neuschaefer@gmx.net \
    --cc=jacob.e.keller@intel.com \
    --cc=jgg@ziepe.ca \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael@walle.cc \
    --cc=pragat.pandya@gmail.com \
    --cc=rd.dunlab@gmail.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).