linux-kernel - Re: [PATCH v4 2/4] nvme-pci: Add support for variable IO SQ element size

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: <8545a898-e80c-5ab6-6f9f-f351955db5f0@grimberg.me>
Date:   Thu, 22 Aug 2019 19:52:16 -0700
From:   Sagi Grimberg <sagi@...mberg.me>
To:     Benjamin Herrenschmidt <benh@...nel.crashing.org>,
        Christoph Hellwig <hch@....de>
Cc:     linux-nvme@...ts.infradead.org, Jens Axboe <axboe@...com>,
        Keith Busch <keith.busch@...el.com>,
        linux-kernel@...r.kernel.org, Paul Pawlowski <paul@...rm.io>
Subject: Re: [PATCH v4 2/4] nvme-pci: Add support for variable IO SQ element
 size


>> I'll fix it. Note that I'm going to take it out of the tree soon
>> because it will have conflicts with Jens for-5.4/block, so we
>> will send it to Jens after the initial merge window, after he
>> rebases off of Linus.
> 
> Conflicts too hard to fixup at merge time ? Otherwise I could just
> rebase on top of Jens and put in a topic branch...

The quirk enumeration conflicts with 5.3-rc. Not a big deal, just
thought it'd be easier to handle that way.

Rebasing on top of Jens won't help because his for-5.4/block which
does not have the rc code yet.