linux-kernel - Re: linux-next: manual merge of the tty tree with the drivers-misc tree

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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 27 Sep 2022 01:01:57 +0100
From:   Mark Brown <broonie@...nel.org>
To:     наб <nabijaczleweli@...ijaczleweli.xyz>
Cc:     Greg KH <greg@...ah.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the drivers-misc
 tree

On Tue, Sep 27, 2022 at 01:11:11AM +0200, наб wrote:

> Similar situation as
>   https://lore.kernel.org/all/20220926210631.657728-1-broonie@kernel.org/t
> but the merge appears horribly broken only in the non-english files,
> the english diff seems mostly fine.

The non-English files just carried on the prior merge problem (in
general I default to skipping out on merge conflicts in documentation in
languages I can't read, admittedly this is usually also in non-latin
scripts).

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)