linux-kernel - Re: [GIT PULL] Char/Misc driver updates 5.19-rc1

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-=wjJjkvt5rfFA=19auwz5Ahc-9Y7qL4_t9rLCcyD+BZoDA@mail.gmail.com>
Date:   Fri, 3 Jun 2022 11:44:27 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Greg KH <gregkh@...uxfoundation.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Arnd Bergmann <arnd@...db.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] Char/Misc driver updates 5.19-rc1

On Fri, Jun 3, 2022 at 3:45 AM Greg KH <gregkh@...uxfoundation.org> wrote:
>
> Note, there are 3 merge conflicts when merging this with your tree:
>         - MAINTAINERS, should be easy to resolve
>         - drivers/slimbus/qcom-ctrl.c, should be straightforward
>           resolution
>         - drivers/misc/lkdtm/stackleak.c, not an easy resolution.

Heh.  They were all very straightforward, and in fact the MAINTAINERS
one was the most annoying by far, just because there are so many
unrelated commits there (including a re-ordering of a couple of lines
close-by in a previous merge) and I want to make sure they had nothing
relevant.

The stackleak one may have looked a bit nasty, but actually had a lot
less unrelated noise around it, so I find those ones easier to verify.

Famous last words.

                  Linus