Merge branch 'upstream'

diff --cc drivers/scsi/libata-core.c
Simple merge

diff --cc drivers/scsi/sata_mv.c
index 088630a890ed3d95fb670f46e16fc271424d1ca5,ac184e60797e5f1ffe055c999d648cd06e58c557..9687646d73e1ccd89f2df58222b1709573a91494
--- 1/drivers/scsi/sata_mv.c
--- 2/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@@ -86,17 -84,9 +84,10 @@@ enum 
        /* Host Flags */
        MV_FLAG_DUAL_HC         = (1 << 30),  /* two SATA Host Controllers */
        MV_FLAG_IRQ_COALESCE    = (1 << 29),  /* IRQ coalescing capability */
-       MV_FLAG_GLBL_SFT_RST    = (1 << 28),  /* Global Soft Reset support */
        MV_COMMON_FLAGS         = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 -                                 ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO),
 +                                 ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
 +                                 ATA_FLAG_PIO_POLLING),
-       MV_6XXX_FLAGS           = (MV_FLAG_IRQ_COALESCE | 
-                                  MV_FLAG_GLBL_SFT_RST),
- 
-       chip_504x               = 0,
-       chip_508x               = 1,
-       chip_604x               = 2,
-       chip_608x               = 3,
+       MV_6XXX_FLAGS           = MV_FLAG_IRQ_COALESCE,
  
        CRQB_FLAG_READ          = (1 << 0),
        CRQB_TAG_SHIFT          = 1,

diff --cc drivers/scsi/sata_promise.c
Simple merge

diff --cc drivers/scsi/sata_qstor.c
Simple merge

diff --cc drivers/scsi/sata_sx4.c
Simple merge

diff --cc drivers/scsi/sata_vsc.c
Simple merge

diff --cc include/linux/libata.h
index a7cb46ca45e70108875348c81f91a8716d757744,83a83babff8465a6494e28c3def5d3795608aa74..2929282beb4011c45fafbb9c88e46c8baf2dbc5d
--- 1/include/linux/libata.h
--- 2/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -118,8 -119,9 +120,9 @@@ enum 
        ATA_FLAG_MMIO           = (1 << 6), /* use MMIO, not PIO */
        ATA_FLAG_SATA_RESET     = (1 << 7), /* use COMRESET */
        ATA_FLAG_PIO_DMA        = (1 << 8), /* PIO cmds via DMA */
 -      ATA_FLAG_NOINTR         = (1 << 9), /* FIXME: Remove this once
 -                                           * proper HSM is in place. */
 +      ATA_FLAG_PIO_POLLING    = (1 << 9), /* use polling PIO if LLD
 +                                           * doesn't handle PIO interrupts */
+       ATA_FLAG_DEBUGMSG       = (1 << 10),
  
        ATA_QCFLAG_ACTIVE       = (1 << 1), /* cmd not yet ack'd to scsi lyer */
        ATA_QCFLAG_SG           = (1 << 3), /* have s/g table? */