> -----Original Message----- > From: Sagi Grimberg <s...@grimberg.me> > Sent: Wednesday, August 14, 2019 3:15 PM > To: Limonciello, Mario; Keith Busch > Cc: Jens Axboe; Christoph Hellwig; linux-n...@lists.infradead.org; LKML; Hong, > Ryan; Wang, Crag; s...@google.com; Hyde, Charles - Dell Team; Dominguez, Jared > Subject: Re: [PATCH v2] nvme: Add quirk for LiteON CL1 devices running FW > 22301111 > > > [EXTERNAL EMAIL] > > Mario, > > Can you please respin a patch that applies cleanly on nvme-5.4?
It looks like nvme-5.4 is missing the commit coming in from Rafael's linux-next tree that it's dependent upon: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/drivers/nvme/host?h=linux-next&id=4eaefe8c621c6195c91044396ed8060c179f7aae Could you cherry pick that into nvme-5.4 as well? It should apply cleanly then. Otherwise, would you prefer this to come in Rafael's tree too?