Merge remote-tracking branch 'scsi/for-next'

Conflicts:
	drivers/ata/libata-core.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/ata/libata-core.c
index c3fbdca029ea06f8ec396c2e6ca9628920362313,6aa72b8350dad99a662fe3b99ab3697a5057d683..9d1e66f248831ad3f02ab0b4377e0cf6e9c75be8
--- 1/drivers/ata/libata-core.c
--- 2/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@@ -5295,9 -5294,10 +5299,8 @@@ static int ata_port_request_pm(struct a
        return rc;
  }
  
- static int ata_port_suspend_common(struct device *dev, pm_message_t mesg)
 -#define to_ata_port(d) container_of(d, struct ata_port, tdev)
 -
+ static int __ata_port_suspend_common(struct ata_port *ap, pm_message_t mesg, int *async)
  {
-       struct ata_port *ap = to_ata_port(dev);
        unsigned int ehi_flags = ATA_EHI_QUIET;
        int rc;
  

diff --cc drivers/ata/libata-eh.c
Simple merge

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

diff --cc include/linux/libata.h
Simple merge