Re: [GIT PULL] Documentation for 5.8

From: Linus Torvalds
Date: Mon Jun 01 2020 - 18:52:49 EST

On Mon, Jun 1, 2020 at 8:46 AM Jonathan Corbet <corbet@xxxxxxx> wrote:
> There will be, alas, more of the usual trivial merge conflicts.

Heh. And one of those conflicts was just due to the arm64 people
fixing some warnings differently from the doc people.

I took the doc version that kept the allegedly "unexpected
indentation", and fixed it by just adding the proper blank lines. That
seemed to be the more sphinx-aware fix.

Funnily enough, the commit from the arm64 tree that re-indented those
lines _also_ added the blank lines, so that's presumably what really
fixed the warning, and the re-indentation was just due to the warning
language implying it was needed.