Merge branch 'linus' into perfcounters/core

Merge reason: need the upstream facility added by:

  7f1e2ca: hrtimer: fix rq->lock inversion (again)

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index aeab5d9dff27..3fcb64b91c43 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1051,12 +1051,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                 good_bytes = sd_completed_bytes(SCpnt);
                 break;
         case RECOVERED_ERROR:
-                /* Inform the user, but make sure that it's not treated
-                 * as a hard error.
-                 */
-                scsi_print_sense("sd", SCpnt);
-                SCpnt->result = 0;
-                memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
                 good_bytes = scsi_bufflen(SCpnt);
                 break;
         case NO_SENSE: