Merge 4.5-rc4 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 29189aeace19..4571ef1a12a9 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -682,9 +682,12 @@ static inline bool blk_write_same_mergeable(struct bio *a, struct bio *b)
 /*
  * q->prep_rq_fn return values
  */
-#define BLKPREP_OK              0       /* serve it */
-#define BLKPREP_KILL            1       /* fatal error, kill */
-#define BLKPREP_DEFER           2       /* leave on queue */
+enum {
+        BLKPREP_OK,             /* serve it */
+        BLKPREP_KILL,           /* fatal error, kill, return -EIO */
+        BLKPREP_DEFER,          /* leave on queue */
+        BLKPREP_INVALID,        /* invalid command, kill, return -EREMOTEIO */
+};
 
 extern unsigned long blk_max_low_pfn, blk_max_pfn;