* linux-next: manual merge of the libata tree with Linus' tree
@ 2010-03-22 1:44 Stephen Rothwell
2010-03-28 4:45 ` Jeff Garzik
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-03-22 1:44 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-next, linux-kernel, Shane Huang, Anton Vorontsov
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
Hi Jeff,
Today's linux-next merge of the libata tree got a conflict in
drivers/ata/ahci.c between commit
5db5b0215af94a36d4bf10900ff9707b6d5c1610 ("ahci: pp->active_link is not
reliable when FBS is enabled") from Linus' tree and commit
efd7cb719e07433588ee5c6a99b1208b0aff6295 ("ahci: Move generic code into
libahci") from the libata tree.
I applied the changes to drivers/ata/ahci.c from the former commit to
drivers/ata/libahci.c (where the latter commit moves it).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the libata tree with Linus' tree
2010-03-22 1:44 linux-next: manual merge of the libata tree with Linus' tree Stephen Rothwell
@ 2010-03-28 4:45 ` Jeff Garzik
2010-03-28 9:26 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Garzik @ 2010-03-28 4:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Shane Huang, Anton Vorontsov
On 03/21/2010 09:44 PM, Stephen Rothwell wrote:
> Hi Jeff,
>
> Today's linux-next merge of the libata tree got a conflict in
> drivers/ata/ahci.c between commit
> 5db5b0215af94a36d4bf10900ff9707b6d5c1610 ("ahci: pp->active_link is not
> reliable when FBS is enabled") from Linus' tree and commit
> efd7cb719e07433588ee5c6a99b1208b0aff6295 ("ahci: Move generic code into
> libahci") from the libata tree.
>
> I applied the changes to drivers/ata/ahci.c from the former commit to
> drivers/ata/libahci.c (where the latter commit moves it).
Should be fixed now...
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the libata tree with Linus' tree
@ 2014-02-17 2:14 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2014-02-17 2:14 UTC (permalink / raw)
To: Tejun Heo
Cc: linux-next, linux-kernel, Andrew Lunn, Jason Cooper,
Ezequiel Garcia
[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]
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@canb•auug.org.au
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 #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-17 2:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-22 1:44 linux-next: manual merge of the libata tree with Linus' tree Stephen Rothwell
2010-03-28 4:45 ` Jeff Garzik
2010-03-28 9:26 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-02-17 2:14 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox