3 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index e0deeb2cc939..09c2300ddb37 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -34,6 +34,7 @@
 #define MWAVE_MINOR             219     /* ACP/Mwave Modem */
 #define MPT_MINOR               220
 #define MPT2SAS_MINOR           221
+#define MPT3SAS_MINOR           222
 #define UINPUT_MINOR            223
 #define MISC_MCELOG_MINOR       227
 #define HPET_MINOR              228
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 55367b04dc94..e65c62e82c5a 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -137,6 +137,7 @@ struct scsi_device {
         unsigned use_10_for_ms:1; /* first try 10-byte mode sense/select */
         unsigned no_report_opcodes:1;   /* no REPORT SUPPORTED OPERATION CODES */
         unsigned no_write_same:1;       /* no WRITE SAME command */
+        unsigned use_16_for_rw:1; /* Use read/write(16) over read/write(10) */
         unsigned skip_ms_page_8:1;      /* do not use MODE SENSE page 0x08 */
         unsigned skip_ms_page_3f:1;     /* do not use MODE SENSE page 0x3f */
         unsigned skip_vpd_pages:1;      /* do not read VPD pages */
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index 98b3a20a0102..9b8e08879cfc 100644
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -36,6 +36,7 @@ enum sas_linkrate {
         SAS_LINK_RATE_3_0_GBPS = 9,
         SAS_LINK_RATE_G2 = SAS_LINK_RATE_3_0_GBPS,
         SAS_LINK_RATE_6_0_GBPS = 10,
+        SAS_LINK_RATE_12_0_GBPS = 11,
         /* These are virtual to the transport class and may never
          * be signalled normally since the standard defined field
          * is only 4 bits */