The patch titled Tiny ATA merge fixup has been added to the -mm tree. Its filename is rework-legacy-handling-to-remove-much-of-the-cruft-fix-2.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Tiny ATA merge fixup From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> In -ac host_set->next is logically always NULL so Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/ata_piix.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/scsi/ata_piix.c~rework-legacy-handling-to-remove-much-of-the-cruft-fix-2 drivers/scsi/ata_piix.c --- a/drivers/scsi/ata_piix.c~rework-legacy-handling-to-remove-much-of-the-cruft-fix-2 +++ a/drivers/scsi/ata_piix.c @@ -1148,8 +1148,7 @@ static int piix_init_one (struct pci_dev static void piix_host_stop(struct ata_host_set *host_set) { -// if (host_set->next == NULL) -// kfree(host_set->private_data); + kfree(host_set->private_data); ata_host_stop(host_set); } _ Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are git-libata-all.patch 1-of-2-jmicron-driver.patch 2-of-2-jmicron-driver-plumbing-and-quirk.patch non-libata-driver-for-jmicron-devices.patch via-pata-controller-xfer-fixes.patch rework-legacy-handling-to-remove-much-of-the-cruft.patch rework-legacy-handling-to-remove-much-of-the-cruft-fix.patch rework-legacy-handling-to-remove-much-of-the-cruft-fix-2.patch megaraid-gcc-41-warning-fix.patch edac-new-opteron-athlon64-memory-controller-driver.patch edac-new-opteron-athlon64-memory-controller-driver-tidy.patch sanitize-3c589_cs.patch make-prot_write-imply-prot_read.patch ide-touch-nmi-watchdog-during-resume-from-str.patch ide-touch-nmi-watchdog-during-resume-from-str-fix.patch sgiioc4-fixup-use-of-mmio-ops.patch ide-claim-extra-dma-ports-regardless-of-channel.patch ide-always-release-dma-engine.patch ide-error-handling-fixes.patch ide-hpt3xxn-clocking-fixes.patch ide-fix-hpt37x-timing-tables.patch ide-optimize-hpt37x-timing-tables.patch ide-fix-hpt3xx-hotswap-support.patch ide-fix-the-case-of-multiple-hpt3xx-chips-present.patch ide-hpt3xx-fix-pci-clock-detection.patch ide-hpt3xx-fix-pci-clock-detection-fix-2.patch piix-fix-82371mx-enablebits.patch piix-remove-check-for-broken-mw-dma-mode-0.patch piix-slc90e66-pio-mode-fallback-fix.patch make-number-of-ide-interfaces-configurable.patch ide_dma_speed-fixes.patch hpt3xx-rework-rate-filtering.patch hpt3xx-rework-rate-filtering-tidy.patch hpt3xx-print-the-real-chip-name-at-startup.patch hpt3xx-switch-to-using-pci_get_slot.patch hpt3xx-cache-channels-mcr-address.patch hpt3x7-merge-speedproc-handlers.patch hpt370-clean-up-dma-timeout-handling.patch enable-cdrom-dma-access-with-pdc20265_old.patch ide-fix-revision-comparison-in-ide_in_drive_list.patch ide-backport-piix-fixes-from-libata-into-the-legacy-driver.patch hpt3xx-init-code-rewrite.patch move-ide-to-unmaintained-drop-reference-to-old-git-tree.patch drivers-ide-cleanups.patch ide-remove-dma_base2-field-from-ide_hwif_t.patch revert-tty-buffering-comment-out-debug-code.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