Messages in this thread Patches in this message | | | Date | Thu, 13 Oct 2022 23:21:26 +0900 | Subject | Re: [PATCH v2 0/6] docs: Improvements to our HTML output | From | Akira Yokosawa <> |
| |
Hi Jon,
On Wed, 12 Oct 2022 06:38:51 -0600, Jonathan Corbet wrote: > Bagas Sanjaya <bagasdotme@gmail.com> writes: > >> Hmm, I can't cleanly apply this patch series on top of either Linus's tree >> or linux-next due to conflicts on [1/6]. On what commit this series is based >> on? > > docs-next, which is still running off the pre-6.0 base until after the > merge window closes. Hmm...
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.
[From 1/6]:
------------------------------------------------------ @@ -371,7 +393,7 @@ html_use_smartypants = False # Custom sidebar templates, maps document names to template names. # Note that the RTD theme ignores this -html_sidebars = { '**': ['searchbox.html', 'localtoc.html', 'sourcelink.html']} +html_sidebars = { '**': ["about.html", 'searchbox.html', 'localtoc.html', 'sourcelink.html']} # Additional templates that should be rendered to pages, maps page names to # template names. ------------------------------------------------------ What can be cleanly applied:
------------------------------------------------------ @@ -371,7 +393,7 @@ html_use_smartypants = False # Custom sidebar templates, maps document names to template names. # Note that the RTD theme ignores this. -html_sidebars = { '**': ['searchbox.html', 'localtoc.html', 'sourcelink.html']} +html_sidebars = { '**': ["about.html", 'searchbox.html', 'localtoc.html', 'sourcelink.html']} # Additional templates that should be rendered to pages, maps page names to # template names. ------------------------------------------------------ There is an additional period at the comment of:
> # Note that the RTD theme ignores this. ^ So if you remove the period first, you should be able to apply the patch set cleanly starting from docs-next or linux-next, I guess.
Sidenote: I see this warning when applying 5/6:
.git/rebase-apply/patch:18: trailing whitespace. margin: 20px 10px 0 10px; warning: 1 line adds whitespace errors. Hope this helps.
Akira
> > If I need to post another round before merging I'll drag everything > forward to a more current base. > > Thanks, > > jon
| |