On Thu, Aug 19, 2021 at 03:57:23PM -0700, Luis Chamberlain wrote: > > if (nvme_nvm_register(ns, disk->disk_name, node)) { > > dev_warn(ctrl->device, "LightNVM init failure\n"); > > - goto out_put_disk; > > + goto out_unlink_ns; > > } > > } > > This hunk will fail because of the now removed NVME_QUIRK_LIGHTNVM. The > last part of the patch then can be removed to apply to linux-next. So this is not in the for-5.15/block tree, just the drivers one. Jens, do you want to start a -late branch ontop of the block and drivers branches so that we can pre-resolve these mergeѕ?