linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>,
	Michael Ellerman <mpe@ellerman.id.au>,
	PowerPC <linuxppc-dev@lists.ozlabs.org>,
	Vishal Parmar <vishistriker@gmail.com>,
	Brigham Campbell <me@brighamcampbell.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build warning after merge of the jc_docs tree
Date: Thu, 31 Jul 2025 00:31:49 +1000	[thread overview]
Message-ID: <20250731003149.3fa05f7f@canb.auug.org.au> (raw)
In-Reply-To: <87cy9hx272.fsf@trenco.lwn.net>

[-- Attachment #1: Type: text/plain, Size: 1016 bytes --]

Hi Jon,

On Wed, 30 Jul 2025 07:01:21 -0600 Jonathan Corbet <corbet@lwn.net> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > Hi all,
> >
> > After merging the jc_docs tree, today's linux-next build (htmldocs)
> > produced this warning:
> >
> > Documentation/arch/powerpc/index.rst:7: WARNING: duplicated entry found in toctree: arch/powerpc/htm
> >
> > Introduced by commit
> >
> >   c361f76da696 ("docs: powerpc: Add htm.rst to table of contents")
> >
> > interacting with commit
> >
> >   19122a7c28ed ("docs: powerpc: add htm.rst to toctree")
> >
> > from the powerpc tree.  
> 
> Did that just get added there?  I've had that fix since early June...I'd
> rather not drop it (and have to redo my 6.17 pull request) now if
> possible...

Yeah, it was added to the powerpc tree last night (or yesterday).  Just
tell Linus to take your version (I think) when he merges the 2 trees.

Or a fix patch could be sent after both are merged.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

      parent reply	other threads:[~2025-07-30 14:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-30  0:29 linux-next: build warning after merge of the jc_docs tree Stephen Rothwell
2025-07-30 13:01 ` Jonathan Corbet
2025-07-30 14:30   ` Christophe Leroy
2025-07-30 15:14     ` Randy Dunlap
2025-07-30 14:31   ` Stephen Rothwell [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=20250731003149.3fa05f7f@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=corbet@lwn.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=maddy@linux.ibm.com \
    --cc=me@brighamcampbell.com \
    --cc=mpe@ellerman.id.au \
    --cc=vishistriker@gmail.com \
    /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).