Merge tag 'v3.15-rc1' into for-3.16/core

We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.

1 files changed, 1 insertions, 1 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index c320def0fe81..1fe9ff6e6802 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1307,7 +1307,7 @@ void __blk_put_request(struct request_queue *q, struct request *req)
                 struct request_list *rl = blk_rq_rl(req);
 
                 BUG_ON(!list_empty(&req->queuelist));
-                BUG_ON(!hlist_unhashed(&req->hash));
+                BUG_ON(ELV_ON_HASH(req));
 
                 blk_free_request(rl, req);
                 freed_request(rl, flags);