Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 9cd0a2d41816..c2d3785ec227 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1702,6 +1702,8 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
 
                 if (qc->err_mask & ~AC_ERR_OTHER)
                         qc->err_mask &= ~AC_ERR_OTHER;
+        } else if (qc->tf.command == ATA_CMD_REQ_SENSE_DATA) {
+                qc->result_tf.command |= ATA_SENSE;
         }
 
         /* finish up */
@@ -4356,10 +4358,10 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "ST380013AS",         "3.20",         ATA_HORKAGE_MAX_SEC_1024 },
 
         /*
-         * Device times out with higher max sects.
+         * These devices time out with higher max sects.
          * https://bugzilla.kernel.org/show_bug.cgi?id=121671
          */
-        { "LITEON CX1-JB256-HP", NULL,          ATA_HORKAGE_MAX_SEC_1024 },
+        { "LITEON CX1-JB*-HP",  NULL,           ATA_HORKAGE_MAX_SEC_1024 },
 
         /* Devices we expect to fail diagnostics */