On Mon, May 20, 2019 at 07:20:56PM -0600, Jens Axboe wrote: > On 5/20/19 7:17 PM, Ming Lei wrote: > > On Tue, May 21, 2019 at 01:09:39AM +0000, Jens Axboe wrote: > >> On 5/20/19 5:17 AM, Christoph Hellwig wrote: > >>> Jens, > >>> > >>> is this ok for 5.2? If not we need to hack around the sector > >>> accounting in nvme, and possibly virtio. > >> > >> I'd rather do it right in 5.2, especially if we can get something > >> acceptable cobbled together this week. > > > > If this patchset will be merged to 5.2, please remove the following > > two lines from patch 1: > > > > Fixes: b35ba01ea697 ("nvme: support ranged discard requests") > > Fixes: 1f23816b8eb8 ("virtio_blk: add discard and write zeroes support") > > > > > > Because the patch 1 doesn't fix them actually. > > I don't want to merge something unless you are happy with it as well. > Are you fine with going this route? I am fine with this route, and just try to make the commit log not misleading. Thanks, Ming