Messages in this thread | | | Subject | Re: [PATCH v4 2/4] nvme-pci: Add support for variable IO SQ element size | From | Sagi Grimberg <> | Date | Thu, 22 Aug 2019 19:52:16 -0700 |
| |
>> 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.
| |