From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Fri, 26 Sep 2014 23:20:06 +0000 (-0400)
Subject: block: Don't merge requests if integrity flags differ
X-Git-Tag: fixes-against-v3.18-rc2~51^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eaf99beadcefbf126fa05e66fb40fca999e09fd;p=pandora-kernel.git

block: Don't merge requests if integrity flags differ

We'd occasionally merge requests with conflicting integrity flags.
Introduce a merge helper which checks that the requests have compatible
integrity payloads.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

Reading git-diff-tree failed