The patch titled AVR32: Use auto.conf instead of MARKER has been added to the -mm tree. Its filename is avr32-use-autoconf-instead-of-marker.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: AVR32: Use auto.conf instead of MARKER From: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> include/config/MARKER was killed by the commit 'kconfig: integrate split config into silentoldconfig', which also updated all arches to use include/config/auto.conf instead. This brings AVR32 in sync with everyone else. Signed-off-by: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/avr32/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/avr32/Makefile~avr32-use-autoconf-instead-of-marker arch/avr32/Makefile --- a/arch/avr32/Makefile~avr32-use-autoconf-instead-of-marker +++ a/arch/avr32/Makefile @@ -34,7 +34,7 @@ libs-y += arch/avr32/lib/ #$(LIBGCC) archincdir-$(CONFIG_PLATFORM_AT32AP) := arch-at32ap -include/asm-avr32/.arch: $(wildcard include/config/platform/*.h) include/config/MARKER +include/asm-avr32/.arch: $(wildcard include/config/platform/*.h) include/config/auto.conf @echo ' SYMLINK include/asm-avr32/arch -> include/asm-avr32/$(archincdir-y)' ifneq ($(KBUILD_SRC),) $(Q)mkdir -p include/asm-avr32 _ Patches currently in -mm which might be from hskinnemoen@xxxxxxxxx are avr32-arch.patch avr32-config_debug_bugverbose-and-config_frame_pointer.patch avr32-fix-invalid-constraints-for-stcond.patch avr32-add-support-for-irq-flags-state-tracing.patch avr32-turn-off-support-for-discontigmem-and-sparsemem.patch avr32-always-enable-config_embedded.patch avr32-export-the-find__bit-functions.patch avr32-add-defconfig-for-at32stk1002.patch avr32-use-autoconf-instead-of-marker.patch avr32-dont-assume-anything-about-max_nr_zones.patch avr32-add-i-o-port-access-primitives.patch avr32-use-linux-pfnh.patch avr32-kill-config_discontigmem-support-completely.patch avr32-add-nsproxy-definition.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