[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87a65ziqn6.fsf@meer.lwn.net>
Date: Thu, 13 Oct 2022 11:23:41 -0600
From: Jonathan Corbet <corbet@....net>
To: Akira Yokosawa <akiyks@...il.com>
Cc: bagasdotme@...il.com, jani.nikula@...ux.intel.com,
linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org,
mchehab@...nel.org, Randy Dunlap <rdunlap@...radead.org>
Subject: Re: [PATCH v2 0/6] docs: Improvements to our HTML output
Akira Yokosawa <akiyks@...il.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
Powered by blists - more mailing lists