From: Stephen Rothwell on
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(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Jeff Garzik on
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...


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on
Hi Jeff.

On Sun, 28 Mar 2010 00:45:57 -0400 Jeff Garzik <jeff(a)garzik.org> wrote:
>
> Should be fixed now...

Thanks.

--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/