Merge tag 'v3.0.48' into exp

This is the 3.0.48 stable release # gpg: Signature made Mon 22 Oct 2012 05:36:30 PM CEST using RSA key ID 6092693E # gpg: Can't check signature: public key not found * tag 'v3.0.48': Linux 3.0.48 Revert "block: fix request_queue->flags initialization"
tamcore · Oct 23, 2012 · 5eacb91 · 5eacb91
2 parents 8f1dde2 + 9fc7170
commit 5eacb91
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 0
-SUBLEVEL = 47
+SUBLEVEL = 48
 EXTRAVERSION =
 NAME = Sneaky Weasel
 

diff --git a/block/blk-core.c b/block/blk-core.c
@@ -524,7 +524,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
 	q->request_fn		= rfn;
 	q->prep_rq_fn		= NULL;
 	q->unprep_rq_fn		= NULL;
-	q->queue_flags		|= QUEUE_FLAG_DEFAULT;
+	q->queue_flags		= QUEUE_FLAG_DEFAULT;
 
 	/* Override internal queue lock with supplied lock pointer */
 	if (lock)