From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Wed, 29 Oct 2014 02:27:43 +0000 (-0600)
Subject: block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined
X-Git-Tag: omap-for-v3.19/fixes-not-urgent-part1~40^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb1a5ab6ece7a37da4ac98ee26b0475b7c3ea79e;p=pandora-kernel.git

block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined

Commit 4eaf99beadce switched to returning bool and as a result reversed
the logic of the integrity merge checks.  However, the empty stubs used
when the block integrity code is compiled out were still returning
0. Make these stubs return "true".

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reported-by: Michael L. Semon <mlsemon35@gmail.com>
Tested-by: Michael L. Semon <mlsemon35@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

Reading git-diff-tree failed