From 6f1549a8f461c6e73b0bc6230b0fe0611e454fea Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Mon, 31 Oct 2005 09:23:54 +0100
Subject: [PATCH] --- yaml --- r: 11984 b: refs/heads/master c:
 581c1b14394aee60aff46ea67d05483261ed6527 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/block/noop-iosched.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ad3cd499af6..c3c8d3bec4eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fc207419d95e0e16fdc78e2f48f7c0b3640ffe5
+refs/heads/master: 581c1b14394aee60aff46ea67d05483261ed6527
diff --git a/trunk/drivers/block/noop-iosched.c b/trunk/drivers/block/noop-iosched.c
index f56b8edb06e4..e54f006e7e60 100644
--- a/trunk/drivers/block/noop-iosched.c
+++ b/trunk/drivers/block/noop-iosched.c
@@ -9,6 +9,7 @@
 
 static void elevator_noop_add_request(request_queue_t *q, struct request *rq)
 {
+	rq->flags |= REQ_NOMERGE;
 	elv_dispatch_add_tail(q, rq);
 }