The patch titled davinci_nand: cmdlinepart uses MTD IDs has been added to the -mm tree. Its filename is davinci_nand-cmdlinepart-uses-mtd-ids.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: davinci_nand: cmdlinepart uses MTD IDs From: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Remove some legacy code from the davinci_nand driver, which made cmdlinepart ignore the the MTD ID passed to it. Boards can have multiple NAND chips, and some do (like the DM357 EVM), so this dated hack is undesirable. Correct labels a"re like davinci_nand.0" (for chipselect 0). Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Cc: Snehaprabha Narnakaje <nsnehaprabha@xxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mtd/nand/davinci_nand.c | 11 ----------- 1 file changed, 11 deletions(-) diff -puN drivers/mtd/nand/davinci_nand.c~davinci_nand-cmdlinepart-uses-mtd-ids drivers/mtd/nand/davinci_nand.c --- a/drivers/mtd/nand/davinci_nand.c~davinci_nand-cmdlinepart-uses-mtd-ids +++ a/drivers/mtd/nand/davinci_nand.c @@ -717,19 +717,8 @@ syndrome_done: static const char *probes[] __initconst = { "cmdlinepart", NULL }; - const char *master_name; - - /* Set info->mtd.name = 0 temporarily */ - master_name = info->mtd.name; - info->mtd.name = (char *)0; - - /* info->mtd.name == 0, means: don't bother checking - <mtd-id> */ mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes, &mtd_parts, 0); - - /* Restore info->mtd.name */ - info->mtd.name = master_name; } if (mtd_parts_nb <= 0) { _ Patches currently in -mm which might be from dbrownell@xxxxxxxxxxxxxxxxxxxxx are origin.patch linux-next.patch drivers-mfd-remove-obsolete-irq_desc_t-typedef.patch mtd-nand-dont-walk-past-end-of-oobfree.patch mtd-nand-minor-davinci_nand-cleanup.patch mtd-nand-davinci_nand-4-bit-ecc-for-smallpage.patch davinci_nand-cmdlinepart-uses-mtd-ids.patch spi_bfin5xx-limit-reaches-1.patch spi-move-common-spi_setup-functionality-into-core.patch spi-move-more-spi_setup-functionality-into-core.patch mpc52xx_psc_spi-convert-to-cs_control-callback.patch pxa2xx_spi-fix-for-spi_cs_high.patch rtc-rtc-ds1307-add-ds3231.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