Am 09.06.2020 um 13:46 hat Klaus Jensen geschrieben: > On Jun 9 13:17, Philippe Mathieu-Daudé wrote: > > On 6/9/20 11:45 AM, Klaus Jensen wrote: > > > From: Klaus Jensen <k.jen...@samsung.com> > > > > > > I goofed up with commit c09794fe40e3 ("hw/block/nvme: allow use of any > > > valid msix vector"). > > > > Kevin, since your queue isn't merged, can you directly squash the fix? > > The commit (c09794fe40e3) can just be dropped without conflicts, but it > leaves a use of n->params.num_queues in nvme_create_cq() which commit > cde74bfd4b87 ("hw/block/nvme: add max_ioqpairs device parameter") must > fix.
Hm, so it seems this isn't easy to squash in without conflicts (and I would have to rewrite the whole commit message), so I think it's better to just apply the series on top. One problem with the commit message is that it references commit IDs which aren't stable yet. Maybe it's best if I apply these patches, manually fix up the commit ID references and then immediately do a pull request so that they become stable. It would be good to have at least one review, though. Kevin