Merge remote-tracking branch 'kvmtool/master'

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc scripts/kconfig/Makefile
index ba573fe7c74d5bfe0495372931ebff69406f35c2,65580c2f401047b36d81c0b187423145fe6554b9..0b2ab42f06f1bdbbdd3561b91622a883dbd4ddfc
--- 1/scripts/kconfig/Makefile
--- 2/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -33,9 -33,21 +33,13 @@@ silentoldconfig: $(obj)/con
        $(Q)mkdir -p include/generated
        $< --$@ $(Kconfig)
  
 -# 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
+ kvmconfig:
+       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/config -e KVMTOOL_TEST_ENABLE
+       @echo 'Kernel configuration modified to run as KVM guest.'
+ 
 +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;                   \