The patch titled mtd/nand: fix build failure caused by typo has been added to the -mm tree. Its filename is mtd-nand-fix-build-failure-caused-by-typo.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: mtd/nand: fix build failure caused by typo From: Peter Huewe <peterhuewe@xxxxxx> Fix a build failure introduced by the patch mtd: orion_nand.c: add error handling and use resource_size() The patch assigns something to a undeclared variable 'err', whereas the rest of the code uses 'ret' for this task. Signed-off-by: Peter Huewe <peterhuewe@xxxxxx> Reviewed-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx> Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Artem Bityutskiy <dedekind1@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mtd/nand/orion_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/mtd/nand/orion_nand.c~mtd-nand-fix-build-failure-caused-by-typo drivers/mtd/nand/orion_nand.c --- a/drivers/mtd/nand/orion_nand.c~mtd-nand-fix-build-failure-caused-by-typo +++ a/drivers/mtd/nand/orion_nand.c @@ -92,7 +92,7 @@ static int __init orion_nand_probe(struc res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { - err = -ENODEV; + ret = -ENODEV; goto no_res; } _ Patches currently in -mm which might be from peterhuewe@xxxxxx are linux-next.patch mtd-nand-fix-build-failure-caused-by-typo.patch scsi-add-__init-__exit-macros-to-ibmvstgtc.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