linux-kernel - Re: linux-next: manual merge of the driver-core tree with the jc

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] [day] [month] [year] [list]

Date:   Tue, 27 Sep 2022 13:25:23 -0600
From:   Jonathan Corbet <corbet@....net>
To:     Mark Brown <broonie@...nel.org>
Cc:     наб <nabijaczleweli@...ijaczleweli.xyz>,
        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>,
        Manfred Spraul <manfred.spraul@...bosch.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 jc_docs tree

Mark Brown <broonie@...nel.org> writes:

> On Mon, Sep 26, 2022 at 04:54:45PM -0600, Jonathan Corbet wrote:
>> наб <nabijaczleweli@...ijaczleweli.xyz> writes:
>
>> > This also reveals that I missed NBD_REQUEST_MAGIC
>> > (needs to go, same reason as NBD_REPLY_MAGIC)
>> > in the first pass, but that's unrelated here.
>
>> I've been trying to make sense of that merge myself.  Is the right
>> solution that I should just drop 32ba63d4b2e1a ?  Manfred, thoughts on
>> that?
>
> That'd certainly be a viable option too.

OK, I have dropped the conflicting patch.  Manfred, if there are changes
there that still need to get in, please resubmit that part and we'll get
it done.

Thanks,

jon