The patch titled kconfig-integrate-split-config-into-silentoldconfig fix has been removed from the -mm tree. Its filename is kconfig-integrate-split-config-into-silentoldconfig-fix.patch This patch was dropped because it was folded into another patch ------------------------------------------------------ Subject: kconfig-integrate-split-config-into-silentoldconfig fix From: Roman Zippel <zippel@xxxxxxxxxxxxxx> Remove remaining references to include/config/MARKER. Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/arm/Makefile | 2 +- arch/sh/Makefile | 4 ++-- arch/xtensa/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/arm/Makefile~kconfig-integrate-split-config-into-silentoldconfig-fix arch/arm/Makefile --- devel/arch/arm/Makefile~kconfig-integrate-split-config-into-silentoldconfig-fix 2006-06-03 17:13:58.000000000 -0700 +++ devel-akpm/arch/arm/Makefile 2006-06-03 17:13:58.000000000 -0700 @@ -175,7 +175,7 @@ boot := arch/arm/boot # them changed. We use .arch to indicate when they were updated # last, otherwise make uses the target directory mtime. -include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/MARKER +include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf @echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)' ifneq ($(KBUILD_SRC),) $(Q)mkdir -p include/asm-arm diff -puN arch/sh/Makefile~kconfig-integrate-split-config-into-silentoldconfig-fix arch/sh/Makefile --- devel/arch/sh/Makefile~kconfig-integrate-split-config-into-silentoldconfig-fix 2006-06-03 17:13:58.000000000 -0700 +++ devel-akpm/arch/sh/Makefile 2006-06-03 17:13:58.000000000 -0700 @@ -147,7 +147,7 @@ endif # them changed. We use .arch and .mach to indicate when they were # updated last, otherwise make uses the target directory mtime. -include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/MARKER +include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/auto.conf @echo ' SYMLINK include/asm-sh/cpu -> include/asm-sh/$(cpuincdir-y)' $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi $(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu @@ -157,7 +157,7 @@ include/asm-sh/.cpu: $(wildcard include/ # don't, just reference the parent directory so the semantics are # kept roughly the same. -include/asm-sh/.mach: $(wildcard include/config/sh/*.h) include/config/MARKER +include/asm-sh/.mach: $(wildcard include/config/sh/*.h) include/config/auto.conf @echo -n ' SYMLINK include/asm-sh/mach -> ' $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi $(Q)if [ -d $(incdir-prefix)$(incdir-y) ]; then \ diff -puN arch/xtensa/Makefile~kconfig-integrate-split-config-into-silentoldconfig-fix arch/xtensa/Makefile --- devel/arch/xtensa/Makefile~kconfig-integrate-split-config-into-silentoldconfig-fix 2006-06-03 17:13:58.000000000 -0700 +++ devel-akpm/arch/xtensa/Makefile 2006-06-03 17:13:58.000000000 -0700 @@ -71,7 +71,7 @@ archprepare: $(archinc)/.platform # Update machine cpu and platform symlinks if something which affects # them changed. -$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/MARKER +$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf @echo ' SYMLINK $(archinc)/xtensa/config -> $(archinc)/xtensa/config-$(CPU)' $(Q)mkdir -p $(archinc) $(Q)mkdir -p $(archinc)/xtensa _ Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are kconfig-improve-config-load-save-output.patch kconfig-fix-config-dependencies.patch kconfig-remove-symbol_yesmodno.patch kconfig-allow-multiple-default-values-per-symbol.patch kconfig-allow-loading-multiple-configurations.patch kconfig-integrate-split-config-into-silentoldconfig.patch kconfig-integrate-split-config-into-silentoldconfig-fix.patch kconfig-move-kernelrelease.patch kconfig-add-symbol-option-config-syntax.patch kconfig-add-defconfig_list-module-option.patch kconfig-add-search-option-for-xconfig.patch kconfig-finer-customization-via-popup-menus.patch kconfig-create-links-in-info-window.patch kconfig-jump-to-linked-menu-prompt.patch kconfig-warn-about-leading-whitespace-for-menu-prompts.patch kconfig-remove-leading-whitespace-in-menu-prompts.patch config-exit-if-no-beginning-filename.patch make-kernelrelease-speedup.patch kconfig-kconfig_overwriteconfig.patch m68k-completely-initialize-hw_regs_t-in-ide_setup_ports.patch m68k-atyfb_base-compile-fix-for-config_pci=n.patch m68k-cleanup-unistdh.patch m68k-remove-some-unused-definitions-in-zorroh.patch m68k-use-c99-initializer.patch m68k-print-correct-stack-trace.patch m68k-restore-amikbd-compatibility-with-24.patch m68k-extra-delay.patch m68k-use-proper-defines-for-zone-initialization.patch m68k-adjust-to-changed-hardirq_mask.patch m68k-m68k-mac-via2-fixes-and-cleanups.patch m68k-clean-up-uaccessh.patch fix-incorrect-sa_onstack-behaviour-for-64-bit-processes.patch adjust-handle_irr_event-return-type.patch time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch time-rename-clocksource-functions.patch fix-rt-mutex-defaults-and-dependencies.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