From: Linus Torvalds Date: Fri, 25 Mar 2011 16:36:35 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block X-Git-Tag: firefly_0821_release~7613^2~1802 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3961cdf85b749f6bab50ad31ee97e9277e7a3b70;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: fix issue with calling blk_stop_queue() from the request_fn handler block: fix bug with inserting flush requests as sort/merge --- 3961cdf85b749f6bab50ad31ee97e9277e7a3b70