From: Jens Axboe Date: Tue, 29 Jun 2010 11:33:38 +0000 (+0200) Subject: block: fixup missing conversion from BIO_RW_DISCARD to REQ_DISCARD X-Git-Tag: v2.6.36-rc1~288^2~113 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ffb52e73b47d6ad86b645942ff49035efdbcd31;p=pandora-kernel.git block: fixup missing conversion from BIO_RW_DISCARD to REQ_DISCARD Didn't cause a merge conflict, so fixed this one up manually post merge. Signed-off-by: Jens Axboe --- Reading git-diff-tree failed