From: tip-bot for Antonio Borneo <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
penberg@kernel.org, borneo.antonio@gmail.com, tglx@linutronix.de,
bp@suse.de
Subject: [tip:x86/urgent] x86/platform: Fix "make O=dir kvmconfig"
Date: Mon, 14 Apr 2014 00:22:30 -0700 [thread overview]
Message-ID: <tip-f96364041ccda63ff4bed96fd06b267d8d841dc0@git.kernel.org> (raw)
In-Reply-To: <1397377568-8375-1-git-send-email-borneo.antonio@gmail.com>
Commit-ID: f96364041ccda63ff4bed96fd06b267d8d841dc0
Gitweb: http://git.kernel.org/tip/f96364041ccda63ff4bed96fd06b267d8d841dc0
Author: Antonio Borneo <borneo.antonio@gmail.com>
AuthorDate: Sun, 13 Apr 2014 16:26:08 +0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 14 Apr 2014 08:50:36 +0200
x86/platform: Fix "make O=dir kvmconfig"
Running:
make O=dir x86_64_defconfig
make O=dir kvmconfig
the second command dirties the source tree with file ".config",
symlink "source" and objects in folder "scripts".
Fixed by using properly prefixed paths in the arch Makefile.
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Acked-by: Borislav Petkov <bp@suse.de>
Cc: Pekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/1397377568-8375-1-git-send-email-borneo.antonio@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 3b9348a..0db8910 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -250,8 +250,8 @@ archclean:
PHONY += kvmconfig
kvmconfig:
$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))
- $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config
- $(Q)yes "" | $(MAKE) oldconfig
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/kvm_guest.config
+ $(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
define archhelp
echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)'
prev parent reply other threads:[~2014-04-14 7:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-13 8:26 [PATCH] x86/platform: fix " Antonio Borneo
2014-04-13 11:47 ` Borislav Petkov
2014-04-14 7:22 ` tip-bot for Antonio Borneo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-f96364041ccda63ff4bed96fd06b267d8d841dc0@git.kernel.org \
--to=tipbot@zytor.com \
--cc=borneo.antonio@gmail.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=penberg@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome