Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next

2016-03-18 16:07:38 -04:00
parent f93812846f ed782b5a70 d6785d9152 8e0b60b96b
commit 8b23a8ce10
33 changed files with 488 additions and 465 deletions
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -499,7 +499,8 @@ struct request_queue {

 #define QUEUE_FLAG_MQ_DEFAULT	((1 << QUEUE_FLAG_IO_STAT) |		\
 				 (1 << QUEUE_FLAG_STACKABLE)	|	\
-				 (1 << QUEUE_FLAG_SAME_COMP))
+				 (1 << QUEUE_FLAG_SAME_COMP)	|	\
+				 (1 << QUEUE_FLAG_POLL))

 static inline void queue_lockdep_assert_held(struct request_queue *q)
 {