From 910ce0cfa940f8ea02bf535a07b95b95b2ae3ec7 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Sat, 29 Oct 2005 18:18:42 +0900
Subject: [PATCH] --- yaml --- r: 10902 b: refs/heads/master c:
 47e627ce83b6df9f4bb8e4b0a4dde1c5d7a4c929 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3a49ad6b1cce..9939507d9b94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc228a04a4c01bbb2f898e180a14f9a976001f79
+refs/heads/master: 47e627ce83b6df9f4bb8e4b0a4dde1c5d7a4c929
diff --git a/trunk/drivers/block/as-iosched.c b/trunk/drivers/block/as-iosched.c
index 4081c36c8c19..564172234819 100644
--- a/trunk/drivers/block/as-iosched.c
+++ b/trunk/drivers/block/as-iosched.c
@@ -1344,6 +1344,7 @@ as_add_aliased_request(struct as_data *ad, struct as_rq *arq, struct as_rq *alia
 	 * Don't want to have to handle merges.
 	 */
 	as_del_arq_hash(arq);
+	arq->request->flags |= REQ_NOMERGE;
 }
 
 /*