Em Wed, 21 Oct 2020 15:13:44 -0600 Jonathan Corbet <[email protected]> escreveu:
> On Thu, 15 Oct 2020 11:12:06 +0200 > Mauro Carvalho Chehab <[email protected]> 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 <[email protected]> > > Commit: Jonathan Corbet <[email protected]> > > > > docs: ipmb: place it at driver-api and convert to ReST > > > > commit ac499fba98c3c65078fd84fa0a62cd6f6d5837ed > > Author: Mauro Carvalho Chehab <[email protected]> > > Commit: Corey Minyard <[email protected]> > > > > 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 <[email protected]> > > 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
