From: Linus Torvalds Date: Sat, 23 Oct 2010 02:30:38 +0000 (-0700) Subject: ocfs2: drop the BLKDEV_IFL_WAIT flag X-Git-Tag: v2.6.37-rc1~157 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8cae0f03f75adb54b1d48ddbc90f84a1f5de186;p=pandora-kernel.git ocfs2: drop the BLKDEV_IFL_WAIT flag Commit dd3932eddf42 ("block: remove BLKDEV_IFL_WAIT") had removed the flag argument to blkdev_issue_flush(), but the ocfs2 merge brought in a new one. It didn't cause a merge conflict, so the merges silently worked out fine, but the result didn't actually compile. Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed