Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued

Backmerge -fixes since there's more DDI-E related cleanups on top of
the pile of -fixes for skl that just landed for 4.3.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i914/intel_dp.c
	drivers/gpu/drm/i915/intel_lrc.c

Conflicts are all fairly harmless adjacent line stuff.

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

1 files changed, 0 insertions, 31 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index cfadccef045c..6457a8a0db9c 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -26,7 +26,6 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/jiffies.h>
-#include <asm/unaligned.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -2523,33 +2522,3 @@ void scsi_build_sense_buffer(int desc, u8 *buf, u8 key, u8 asc, u8 ascq)
         }
 }
 EXPORT_SYMBOL(scsi_build_sense_buffer);
-
-/**
- * scsi_set_sense_information - set the information field in a
- *              formatted sense data buffer
- * @buf:        Where to build sense data
- * @info:       64-bit information value to be set
- *
- **/
-void scsi_set_sense_information(u8 *buf, u64 info)
-{
-        if ((buf[0] & 0x7f) == 0x72) {
-                u8 *ucp, len;
-
-                len = buf[7];
-                ucp = (char *)scsi_sense_desc_find(buf, len + 8, 0);
-                if (!ucp) {
-                        buf[7] = len + 0xa;
-                        ucp = buf + 8 + len;
-                }
-                ucp[0] = 0;
-                ucp[1] = 0xa;
-                ucp[2] = 0x80; /* Valid bit */
-                ucp[3] = 0;
-                put_unaligned_be64(info, &ucp[4]);
-        } else if ((buf[0] & 0x7f) == 0x70) {
-                buf[0] |= 0x80;
-                put_unaligned_be64(info, &buf[3]);
-        }
-}
-EXPORT_SYMBOL(scsi_set_sense_information);