On Sun, Apr 23, 2017 at 08:43:53PM +0300, Sagi Grimberg wrote: > > > + > > + ctrl->ctrl.sqsize = > > + min_t(int, NVME_CAP_MQES(ctrl->cap) + 1, ctrl->ctrl.sqsize); > > This will conflict with 4.11 fixes... I don't think we have much of a chance to avoid that. Should be easy enough to merge, though.