The patch titled Subject: sections: fix section conflicts in drivers/atm has been removed from the -mm tree. Its filename was sections-fix-section-conflicts-in-drivers-atm.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Andi Kleen <ak@xxxxxxxxxxxxxxx> Subject: sections: fix section conflicts in drivers/atm Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Chas Williams <chas@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/atm/eni.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/atm/eni.c~sections-fix-section-conflicts-in-drivers-atm drivers/atm/eni.c --- a/drivers/atm/eni.c~sections-fix-section-conflicts-in-drivers-atm +++ a/drivers/atm/eni.c @@ -1567,7 +1567,7 @@ tx_complete++; /*--------------------------------- entries ---------------------------------*/ -static const char *media_name[] __devinitdata = { +static char * const media_name[] __devinitconst = { "MMF", "SMF", "MMF", "03?", /* 0- 3 */ "UTP", "05?", "06?", "07?", /* 4- 7 */ "TAXI","09?", "10?", "11?", /* 8-11 */ _ Patches currently in -mm which might be from ak@xxxxxxxxxxxxxxx are origin.patch linux-next.patch thp-x86-introduce-have_arch_transparent_hugepage.patch thp-remove-assumptions-on-pgtable_t-type.patch thp-introduce-pmdp_invalidate.patch thp-make-madv_hugepage-check-for-mm-def_flags.patch thp-s390-thp-splitting-backend-for-s390.patch thp-s390-thp-pagetable-pre-allocation-for-s390.patch thp-s390-disable-thp-for-kvm-host-on-s390.patch thp-s390-architecture-backend-for-thp-on-s390.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