Merge branch 'master'

diff --cc drivers/scsi/sata_sil.c
index e14ed4ebbeed8632fe6be6ca4157a280d930797e,9face3c6aa2144fccaaea7ef8d5754076201c0a0..91ecf527bb8a3291dbbc00f14d6cfb2bbb707447
--- 1/drivers/scsi/sata_sil.c
--- 2/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@@ -198,7 -203,19 +202,19 @@@ static const struct ata_port_info sil_p
        {
                .sht            = &sil_sht,
                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO,
+                                 ATA_FLAG_SRST | ATA_FLAG_MMIO |
+                                 SIL_FLAG_RERR_ON_DMA_ACT,
+               .pio_mask       = 0x1f,                 /* pio0-4 */
+               .mwdma_mask     = 0x07,                 /* mwdma0-2 */
+               .udma_mask      = 0x3f,                 /* udma0-5 */
+               .port_ops       = &sil_ops,
+       },
+       /* sil_3114 */
+       {
+               .sht            = &sil_sht,
+               .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 -                                ATA_FLAG_SRST | ATA_FLAG_MMIO |
++                                ATA_FLAG_MMIO |
+                                 SIL_FLAG_RERR_ON_DMA_ACT,
                .pio_mask       = 0x1f,                 /* pio0-4 */
                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                .udma_mask      = 0x3f,                 /* udma0-5 */