The patch titled ata: sata_nv MCP61 using GENERIC instead of SWNCQ has been added to the -mm tree. Its filename is ata-sata_nv-mcp61-using-generic-instead-of-swncq.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: ata: sata_nv MCP61 using GENERIC instead of SWNCQ From: "Kuan Luo" <kluo@xxxxxxxxxx> The mcp61 has bug with ncq. The patch only changes SWNCQ to GENERIC on MCP61 in nv_pci_tbl structure. Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/ata/sata_nv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/ata/sata_nv.c~ata-sata_nv-mcp61-using-generic-instead-of-swncq drivers/ata/sata_nv.c --- a/drivers/ata/sata_nv.c~ata-sata_nv-mcp61-using-generic-instead-of-swncq +++ a/drivers/ata/sata_nv.c @@ -365,9 +365,9 @@ static const struct pci_device_id nv_pci { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2), SWNCQ }, { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA), SWNCQ }, { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2), SWNCQ }, - { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), SWNCQ }, - { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), SWNCQ }, - { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), SWNCQ }, + { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC }, + { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC }, + { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC }, { } /* terminate list */ }; _ Patches currently in -mm which might be from kluo@xxxxxxxxxx are origin.patch ata-sata_nv-mcp61-using-generic-instead-of-swncq.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html