From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E065C55178 for ; Sat, 24 Oct 2020 06:45:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 013042226B for ; Sat, 24 Oct 2020 06:45:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603521939; bh=66+o0TQRHydjos+x14DK62znQJEeGHX+weWJ+zho+Ng=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=tedqbvZKx2UBdwDUpeNmxYxMNBWM0kzwKJkqv9t6fqVPJ5lSQCb8gkBm+sZqipvFW 8aFzC3Ir7aBmP+GpSNLIPVIJJmrjntbpsrxcpsQMGOvAlh9hRW6LpC2Q1HFW1foFqo G4hNoDL6NwEwyDFueFmxny6BHqrQuB4Fl1+9DUnE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759815AbgJXGpi (ORCPT ); Sat, 24 Oct 2020 02:45:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:34344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759806AbgJXGph (ORCPT ); Sat, 24 Oct 2020 02:45:37 -0400 Received: from coco.lan (ip5f5ad5d6.dynamic.kabel-deutschland.de [95.90.213.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 08F7120735; Sat, 24 Oct 2020 06:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603521937; bh=66+o0TQRHydjos+x14DK62znQJEeGHX+weWJ+zho+Ng=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=rzvtFu2UpaKmSNmH/HBfXF84KkKhm1o5JNxMUqVO/SDnZniUzg5sPgopSsG4jYCqK JhZZhFhnhBt9zeaYyyrFPSFvHchIGQo5Eh96+L3hUYUh/FJP94wPVbvOHvAeWb+IMN SJwoQn5Mt3tjJSoRCwA39RnOX7YjdfKZrhqWmoHA= Date: Sat, 24 Oct 2020 08:45:31 +0200 From: Mauro Carvalho Chehab To: Jonathan Corbet Cc: Linux Doc Mailing List , Jonathan =?UTF-8?B?TmV1c2Now6RmZXI=?= , "rd.dunlab@gmail.com" , Corey Minyard , Harald Seiler , Heikki Krogerus , Jacob Keller , Jason Gunthorpe , Michael Walle , Pragat Pandya , Takashi Iwai , linux-kernel@vger.kernel.org Subject: Re: [PATCH] docs: driver-api: remove a duplicated index entry Message-ID: <20201024084531.33fc1b75@coco.lan> In-Reply-To: <20201021151344.4f471fbc@lwn.net> References: <623fb26a8409a7b002e45bdbb6f517ac08fd508a.1602753121.git.mchehab+huawei@kernel.org> <20201021151344.4f471fbc@lwn.net> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Wed, 21 Oct 2020 15:13:44 -0600 Jonathan Corbet escreveu: > On Thu, 15 Oct 2020 11:12:06 +0200 > Mauro Carvalho Chehab 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 > > Commit: Jonathan Corbet > > > > docs: ipmb: place it at driver-api and convert to ReST > > > > commit ac499fba98c3c65078fd84fa0a62cd6f6d5837ed > > Author: Mauro Carvalho Chehab > > Commit: Corey Minyard > > > > 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 > > 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