From: Linus Torvalds Date: Tue, 5 Apr 2011 22:29:01 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux... X-Git-Tag: firefly_0821_release~7613^2~1686 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=44148a667d3715f3a1c37eeff7e954c946cc1efe;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/axboe/linux-2.6-block * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block: ide: always ensure that blk_delay_queue() is called if we have pending IO block: fix request sorting at unplug dm: improve block integrity support fs: export empty_aops ide: ide_requeue_and_plug() reinstate "always plug" behaviour blk-throttle: don't call xchg on bool ufs: remove unessecary blk_flush_plug block: make the flush insertion use the tail of the dispatch list block: get rid of elv_insert() interface block: dump request state on seeing a corrupted request completion --- 44148a667d3715f3a1c37eeff7e954c946cc1efe