Merge branch 'upstream'

Conflicts:

	drivers/scsi/libata-core.c

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 56bb6a4e15f3..c179966f1a2f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -22,6 +22,7 @@ typedef struct request_queue request_queue_t;
 struct elevator_queue;
 typedef struct elevator_queue elevator_t;
 struct request_pm_state;
+struct blk_trace;
 
 #define BLKDEV_MIN_RQ   4
 #define BLKDEV_MAX_RQ   128     /* Default maximum */
@@ -416,6 +417,8 @@ struct request_queue
         unsigned int            sg_reserved_size;
         int                     node;
 
+        struct blk_trace        *blk_trace;
+
         /*
          * reserved for flush operations
          */