Dropped patch 1 as it's already in the queue for 4.1, and dropped the old patch 4 to keep the unused nvme_{get, set}_features argument for now.