> Ah, it doesn't merge with your earlier patch, "nvme: move queue_count to > the nvme_ctrl". That 8-patch series the conflict came from looks good too, > so let's rebase this one on top of that. It applies on v2 of my series. I'll update nvme-4.13 (was waiting for James to ack)