linux-next: manual merge of the libata tree with Linus' tree

[Stephen Rothwell]

Hi Tejun,

Today's linux-next merge of the libata tree got a conflict in
drivers/ata/sata_mv.c between commit 90aa2997029f ("ata: sata_mv: Fix
probe failures with optional phys") from Linus' tree and commit
8ad116e649b2 ("ata: sata_mv: Cleanup only the initialized ports") from
the libata tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/ata/sata_mv.c
index 52b8181ddafd,9c1a11de3044..000000000000
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@@ -4131,9 -4129,11 +4130,12 @@@ static int mv_platform_probe(struct pla
  		if (IS_ERR(hpriv->port_phys[port])) {
  			rc = PTR_ERR(hpriv->port_phys[port]);
  			hpriv->port_phys[port] = NULL;
 -			if ((rc != -EPROBE_DEFER) && (rc != -ENODEV))
 -				dev_warn(&pdev->dev, "error getting phy");
 +			if (rc != -EPROBE_DEFER)
 +				dev_warn(&pdev->dev, "error getting phy %d",
 +					rc);
+ 
+ 			/* Cleanup only the initialized ports */
+ 			hpriv->n_ports = port;
  			goto err;
  		} else
  			phy_power_on(hpriv->port_phys[port]);

Attachment: pgpSNK2CPMEB5.pgp
Description: PGP signature