diff --git a/[refs] b/[refs] index e699afc5525e..3656401da092 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2d8703481f60d67f49e3177196cbe474b11377c +refs/heads/master: 51882d00f07da9601cc962a3596e48aafb4f4163 diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index 71bdf6f2c93b..903e7f15b60d 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/drivers/block/nvme.c @@ -321,6 +321,7 @@ static int nvme_map_bio(struct device *dev, struct nvme_req_info *info, sg_init_table(sg, psegs); bio_for_each_segment(bvec, bio, i) { sg_set_page(sg, bvec->bv_page, bvec->bv_len, bvec->bv_offset); + sg++; /* XXX: handle non-mergable here */ nsegs++; }