lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wiNQwW8LEb-ZDFuYphFxuJW0+tzE1jsYC64LQeGjB7aHg@mail.gmail.com>
Date:   Mon, 1 Jun 2020 15:52:27 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Jonathan Corbet <corbet@....net>,
        Catalin Marinas <catalin.marinas@....com>,
        Randy Dunlap <rdunlap@...radead.org>
Cc:     LKML <linux-kernel@...r.kernel.org>,
        "open list:DOCUMENTATION" <linux-doc@...r.kernel.org>
Subject: Re: [GIT PULL] Documentation for 5.8

On Mon, Jun 1, 2020 at 8:46 AM Jonathan Corbet <corbet@....net> 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.

             Linus

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ