linux-next: manual merge of the kvmtool tree with the kbuild tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


Hi all,

Today's linux-next merge of the kvmtool tree got a conflict in
scripts/kconfig/Makefile between commit f597a718296e
("kconfig/streamline_config.pl: directly access LSMOD from the
environment") from the kbuild tree and commit 3b08ed02633d ("config: Add
'make kvmconfig'") from the kvmtool tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc scripts/kconfig/Makefile
index ba573fe,65580c2..0000000
--- 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;			\

Attachment: pgpIHxusjYZnE.pgp
Description: PGP signature


[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux