Commit-ID: 59df8a25e7fd15dda5a62cd3a19e1205b5e1b111 Gitweb: http://git.kernel.org/tip/59df8a25e7fd15dda5a62cd3a19e1205b5e1b111 Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Sat, 21 Feb 2015 09:39:23 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Sat, 21 Feb 2015 09:41:02 +0100 kvmtool: Synchronize with upstream 'make kvmconfig' version 'make kvmconfig' is now upstream - synchronize the two versions. This fixes uglies like: vega:~/linux/linux> make defconfig scripts/kconfig/Makefile:123: warning: overriding recipe for target `kvmconfig' scripts/kconfig/Makefile:40: warning: ignoring old recipe for target `kvmconfig' Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- scripts/kconfig/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 5558333..9645c07 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -3,7 +3,7 @@ # These targets are used from top-level makefile PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ - localmodconfig localyesconfig kvmconfig + localmodconfig localyesconfig ifdef KBUILD_KCONFIG Kconfig := $(KBUILD_KCONFIG) @@ -36,11 +36,6 @@ silentoldconfig: $(obj)/conf $(Q)mkdir -p include/config include/generated $< --$@ $(Kconfig) -kvmconfig: - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/config -e KVMTOOL_TEST_ENABLE - $(Q)yes "" | make oldconfig > /dev/null - @echo 'Kernel configuration modified to run as KVM guest.' - localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/config include/generated $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|