From: Jonathan Corbet <corbet@lwn.net>
To: Akira Yokosawa <akiyks@gmail.com>
Cc: bagasdotme@gmail.com, jani.nikula@linux.intel.com,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
mchehab@kernel.org, Randy Dunlap <rdunlap@infradead.org>
Subject: Re: [PATCH v2 0/6] docs: Improvements to our HTML output
Date: Thu, 13 Oct 2022 11:23:41 -0600 [thread overview]
Message-ID: <87a65ziqn6.fsf@meer.lwn.net> (raw)
In-Reply-To: <89120a24-f622-eb9b-fde9-635caaabb67f@gmail.com>
Akira Yokosawa <akiyks@gmail.com> writes:
> Actually, I can't apply 1/6 cleanly on docs-next, either.
> As I have your tree in my local repo, "git am -3" worked and pointed
> out there is a merge conflict.
>
> It turns out that one of the hunks in 1/6 doesn't match what could be
> applied cleanly.
OK, apologies...the branch that stuff is on was split out some time ago,
and I had to perform surgery on docs-next in the meantime. I should
have rebased it. I've done so now and will send a v3 to the list; I'll
try to avoid copying everybody again because there are no other changes.
Thanks,
jon
prev parent reply other threads:[~2022-10-13 17:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-11 19:00 [PATCH v2 0/6] docs: Improvements to our HTML output Jonathan Corbet
2022-10-11 19:00 ` [PATCH v2 1/6] docs: Switch the default HTML theme to alabaster Jonathan Corbet
2022-10-11 19:00 ` [PATCH v2 2/6] docs: tweak some Alabaster style parameters Jonathan Corbet
2022-10-11 19:00 ` [PATCH v2 3/6] docs: update sphinx.rst to reflect the default theme change Jonathan Corbet
2022-10-11 19:00 ` [PATCH v2 4/6] docs: sphinx-pre-install: don't require the RTD theme Jonathan Corbet
2022-10-11 19:00 ` [PATCH v2 5/6] docs: improve the HTML formatting of kerneldoc comments Jonathan Corbet
2022-10-11 19:00 ` [PATCH v2 6/6] docs: decruft Documentation/conf.py Jonathan Corbet
2022-10-11 20:04 ` [PATCH v2 0/6] docs: Improvements to our HTML output Mauro Carvalho Chehab
2022-10-11 21:40 ` Jonathan Corbet
2022-10-12 2:10 ` Bagas Sanjaya
2022-10-12 2:25 ` Randy Dunlap
2022-10-12 4:20 ` Bagas Sanjaya
2022-10-12 12:38 ` Jonathan Corbet
2022-10-13 14:21 ` Akira Yokosawa
2022-10-13 17:23 ` Jonathan Corbet [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=87a65ziqn6.fsf@meer.lwn.net \
--to=corbet@lwn.net \
--cc=akiyks@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=jani.nikula@linux.intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=rdunlap@infradead.org \
/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