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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20111103163149.8a2de3ac55098adfe7e13c1d@canb.auug.org.au>
Date:	Thu, 3 Nov 2011 16:31:49 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Sasha Levin <levinsasha928@...il.com>,
	Pekka Enberg <penberg@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sasha Levin <levinsasha928@...il.com>,
	Arnaud Lacombe <lacombar@...il.com>,
	Michal Marek <mmarek@...e.cz>
Subject: linux-next: manual merge of the kvmtool tree with the kbuild tree

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@...b.auug.org.au

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;			\

Content of type "application/pgp-signature" skipped