I added one scaffold patch ('NVMe: Requeue requests on suspended queues'), but ('NVMe: Move error handling to failed reset handler') still required some minor backporting. ('blk-mq: End unstarted requests on dying queue') I left in its pristine cherry-pick condition this time. rtg