On Wed, May 23, 2012 at 10:17:16PM -0700, Matt Johnson wrote:
> From 642d89252201c4155fc3946bf9cdea409e5d263e Mon Sep 17 00:00:00 2001
> From: Matt Johnson <[email protected]>
> Date: Fri, 27 Apr 2012 01:42:30 -0500
> Subject: [PATCH v2] ahci: Detect Marvell 88SE9172 SATA controller
>
> Upstream commit 642d89252201c4155fc3946bf9cdea409e5d263e.
> Please apply to 3.2-stable.
>
> The Marvell 88SE9172 SATA controller (PCI ID 1b4b 917a) already worked
> once it was detected, but was missing an ahci_pci_tbl entry.
>
> Boot tested on a Gigabyte Z68X-UD3H-B3 motherboard.
>
> Signed-off-by: Matt Johnson <[email protected]>
> Signed-off-by: Jeff Garzik <[email protected]>
> ---
> drivers/ata/ahci.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index 79a1e9d..ebaf67e 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -394,6 +394,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
> .driver_data = board_ahci_yes_fbs }, /*
> 88se9128 */
> { PCI_DEVICE(0x1b4b, 0x9125),
> .driver_data = board_ahci_yes_fbs }, /*
> 88se9125 */
> + { PCI_DEVICE(0x1b4b, 0x917a),
> + .driver_data = board_ahci_yes_fbs }, /*
> 88se9172 */
> { PCI_DEVICE(0x1b4b, 0x91a3),
> .driver_data = board_ahci_yes_fbs },
Your patch is line-wrapped and can't be applied.
>
> --
> 1.7.9.5
>
> Upstream commit 642d89252201c4155fc3946bf9cdea409e5d263e.
> Please apply to 3.2-stable.
And you included 2 copies of it?
Hm, maybe I will reconsider the need for you to owe me a beer...
{sigh} I'll go fix it up by hand...
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
