[lkml]   [2014]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the libata tree with Linus' tree
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).

Stephen Rothwell

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
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2014-02-17 04:01    [W:0.022 / U:0.352 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site