The patch titled pata: Sort out MC65 compile for now has been added to the -mm tree. Its filename is pata-sort-out-mc65-compile-for-now.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: pata: Sort out MC65 compile for now From: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/pata_amd.c | 1 - 1 file changed, 1 deletion(-) diff -puN drivers/scsi/pata_amd.c~pata-sort-out-mc65-compile-for-now drivers/scsi/pata_amd.c --- a/drivers/scsi/pata_amd.c~pata-sort-out-mc65-compile-for-now +++ a/drivers/scsi/pata_amd.c @@ -675,7 +675,6 @@ static const struct pci_device_id amd[] { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 }, { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 }, { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 }, - { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 }, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 }, { 0, }, }; _ Patches currently in -mm which might be from alan@xxxxxxxxxx are origin.patch my-name-is-ingo-molnar-you-killed-my-make-allyesconfig-prepare-to-die.patch jmicron-pci-identifiers.patch pata-ata_piix-time0-time1-setup.patch pata-pata_ali-further-debug-work.patch pata-pata_amd-new-chips.patch pata-pata_ali-revisions-below-0x20-need-cd-config-poking-too.patch pata-sort-out-mc65-compile-for-now.patch pata-libata-fix-the-host_set-hacks-and-sort-out-simplex-mode.patch pata-pata_it821x-fix-pass-through.patch pata-ahci-ensure-that-we-dont-grab-both-functions.patch pata-jmicron-add-quirks-to-force-the-device-into-a-sane-mode.patch pata-jmicron-configuration.patch pata-it821x-fix-the-atapi-autodma-setup.patch pata-ata_generic-generic-bios-setup-sff-ata-driver.patch pata-jmicron-ide-old-type-driver.patch pata-pata_qdi-fix-return-code.patch pata-ide-jmicron-finish-writing.patch pata-jmicron-it-works-better-if-you-get-the-file-name-right.patch pata-jmicron-further-clean-up.patch pata-ata_jmicro-fix-an-escapee.patch pata-jmicron-jmicron-multifunction-setup.patch pata-libata-enable-per-device-speed-setting.patch pata-jmicron-missed-one.patch sanitize-3c589_cs.patch ide-backport-piix-fixes-from-libata-into-the-legacy-driver.patch move-ide-to-unmaintained-drop-reference-to-old-git-tree.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