summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2012-01-15 10:29:48 +0100
committerJens Axboe <axboe@kernel.dk>2012-01-15 10:29:48 +0100
commit5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922 (patch)
treefba354212902ad0c7228bff43a38aca6df47c899 /net
parent6898e3bd11cc9a931ef115eee9000ac9d8f8c3cf (diff)
downloadlinux-3.10-5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922.tar.gz
linux-3.10-5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922.tar.bz2
linux-3.10-5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922.zip
Revert "block: recursive merge requests"
This reverts commit 274193224cdabd687d804a26e0150bb20f2dd52c. We have some problems related to selection of empty queues that need to be resolved, evidence so far points to the recursive merge logic making either being the cause or at least the accelerator for this. So revert it for now, until we figure this out. Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions