The patch titled mips-jazz: correct flags for timer io resource has been added to the -mm tree. Its filename is mips-jazz-correct-flags-for-timer-io-resource.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: mips-jazz: correct flags for timer io resource From: Alexey Dobriyan <adobriyan@xxxxxxxxx> arch/mips/jazz/setup.c:55:4: error: Initializer entry defined twice Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/mips/jazz/setup.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN arch/mips/jazz/setup.c~mips-jazz-correct-flags-for-timer-io-resource arch/mips/jazz/setup.c --- a/arch/mips/jazz/setup.c~mips-jazz-correct-flags-for-timer-io-resource +++ a/arch/mips/jazz/setup.c @@ -54,7 +54,7 @@ static struct resource jazz_io_resources .start = 0x40, .end = 0x5f, .name = "timer", - .end = IORESOURCE_BUSY + .flags = IORESOURCE_BUSY }, { .start = 0x80, .end = 0x8f, _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are mips-jazz-correct-flags-for-timer-io-resource.patch procfs-directory-entry-cleanup-fix.patch remove-capabilityh-from-mmh.patch ptrace_peekdata-consolidation.patch ptrace_pokedata-consolidation.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