On Tue, Apr 25, 2017 at 10:58:44AM -0700, Christoph Hellwig wrote: > On Fri, Apr 21, 2017 at 05:49:08PM -0700, jsmart2021@xxxxxxxxx wrote: > > This is a nvme-specific bug. The patch was cut against the > > linux-block tree, for-4.12/block tree. It should be pulled in through > > that tree. > > It conflicts with your nvme changes that are in the nvme-4.12. > Can you respin it? Sorry for the noise. It applies fine and I've applied it.