Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

Two bits were appended to the end of the bitfield
list in struct scsi_device.  Resolve that conflict
by including both bits.

Conflicts:
	include/scsi/scsi_device.h

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 95a656f33a23..fadd5866d40f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -80,6 +80,8 @@ const struct ata_port_operations ata_base_port_ops = {
         .prereset               = ata_std_prereset,
         .postreset              = ata_std_postreset,
         .error_handler          = ata_std_error_handler,
+        .sched_eh               = ata_std_sched_eh,
+        .end_eh                 = ata_std_end_eh,
 };
 
 const struct ata_port_operations sata_port_ops = {
@@ -6644,6 +6646,8 @@ struct ata_port_operations ata_dummy_port_ops = {
         .qc_prep                = ata_noop_qc_prep,
         .qc_issue               = ata_dummy_qc_issue,
         .error_handler          = ata_dummy_error_handler,
+        .sched_eh               = ata_std_sched_eh,
+        .end_eh                 = ata_std_end_eh,
 };
 
 const struct ata_port_info ata_dummy_port_info = {