The patch titled Subject: sections: fix section conflicts in drivers/mmc has been added to the -mm tree. Its filename is sections-fix-section-conflicts-in-drivers-mmc.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andi Kleen <ak@xxxxxxxxxxxxxxx> Subject: sections: fix section conflicts in drivers/mmc Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Chris Ball <cjb@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mmc/host/sdhci-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/mmc/host/sdhci-pci.c~sections-fix-section-conflicts-in-drivers-mmc drivers/mmc/host/sdhci-pci.c --- a/drivers/mmc/host/sdhci-pci.c~sections-fix-section-conflicts-in-drivers-mmc +++ a/drivers/mmc/host/sdhci-pci.c @@ -653,7 +653,7 @@ static const struct sdhci_pci_fixes sdhc .probe = via_probe, }; -static const struct pci_device_id pci_ids[] __devinitdata = { +static const struct pci_device_id pci_ids[] __devinitconst = { { .vendor = PCI_VENDOR_ID_RICOH, .device = PCI_DEVICE_ID_RICOH_R5C822, _ Patches currently in -mm which might be from ak@xxxxxxxxxxxxxxx are compilerh-add-__visible.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 sections-disable-const-sections-for-pa-risc-v2.patch sections-fix-section-conflicts-in-arch-arm.patch sections-fix-section-conflicts-in-arch-frv.patch sections-fix-section-conflicts-in-arch-h8300.patch sections-fix-section-conflicts-in-arch-ia64.patch sections-fix-section-conflicts-in-arch-mips.patch sections-fix-section-conflicts-in-arch-powerpc.patch sections-fix-section-conflicts-in-arch-score.patch sections-fix-section-conflicts-in-arch-sh.patch sections-fix-section-conflicts-in-arch-x86.patch sections-fix-section-conflicts-in-drivers-atm.patch sections-fix-section-conflicts-in-drivers-char.patch sections-fix-section-conflicts-in-drivers-cpufreq.patch sections-fix-section-conflicts-in-drivers-ide.patch sections-fix-section-conflicts-in-drivers-macintosh.patch sections-fix-section-conflicts-in-drivers-mfd.patch sections-fix-section-conflicts-in-drivers-mmc.patch sections-fix-section-conflicts-in-drivers-net.patch sections-fix-section-conflicts-in-drivers-net-hamradio.patch sections-fix-section-conflicts-in-drivers-net-wan.patch sections-fix-section-conflicts-in-drivers-platform-x86.patch sections-fix-section-conflicts-in-drivers-scsi.patch sections-fix-section-conflicts-in-drivers-video.patch sections-fix-section-conflicts-in-mm-percpuc.patch sections-fix-section-conflicts-in-net-can.patch sections-fix-section-conflicts-in-net.patch sections-fix-section-conflicts-in-sound.patch sectons-fix-const-sections-for-crc32-table.patch compat_ioctl-remove-unused-local-typedef.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