linux-next: manual merge of the isci tree with the libata tree

linux-next: manual merge of the isci tree with the libata tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1067 bytes --]

Hi Dan,

Today's linux-next merge of the isci tree got a conflict in
drivers/ata/libata-core.c between commit 6b66d95895c1 ("libata: bind the
Linux device tree to the ACPI device tree") from the libata tree and
commit 95f0f9a02129 ("libata: export ata_port suspend/resume
infrastructure for sas") from the isci tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/ata/libata-core.c
index c14f88c,6f1e459..0000000
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@@ -5291,9 -5294,10 +5297,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;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]