From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Nov 2011 03:58:35 +0000 (+1100)
Subject: Merge remote-tracking branch 'kvmtool/master'
X-Git-Tag: next-20111130~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9b4325b546f95cbf862e97ea90bc1c99df04cd9d;p=karo-tx-linux.git

Merge remote-tracking branch 'kvmtool/master'

Conflicts:
	include/net/9p/9p.h
	scripts/kconfig/Makefile
---

9b4325b546f95cbf862e97ea90bc1c99df04cd9d
diff --cc scripts/kconfig/Makefile
index ba573fe7c74d,65580c2f4010..0b2ab42f06f1
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -33,9 -33,21 +33,13 @@@ silentoldconfig: $(obj)/con
  	$(Q)mkdir -p include/generated
  	$< --$@ $(Kconfig)
  
+ kvmconfig:
+ 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/config -e KVMTOOL_TEST_ENABLE
+ 	@echo 'Kernel configuration modified to run as KVM guest.'
+ 
 -# if no path is given, then use src directory to find file
 -ifdef LSMOD
 -LSMOD_F := $(LSMOD)
 -ifeq ($(findstring /,$(LSMOD)),)
 -  LSMOD_F := $(objtree)/$(LSMOD)
 -endif
 -endif
 -
 -localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 +localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
  	$(Q)mkdir -p include/generated
 -	$(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
 +	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
  	$(Q)if [ -f .config ]; then 					\
  			cmp -s .tmp.config .config ||			\
  			(mv -f .config .config.old.1;			\