linux-kernel - linux-next: manual merge of the kvm tree with the rr 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: <20111228151721.ceff9dc7d7e1c1ab56518aa4@canb.auug.org.au>
Date:	Wed, 28 Dec 2011 15:17:21 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Avi Kivity <avi@...ranet.com>,
	Marcelo Tosatti <mtosatti@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rusty Russell <rusty@...tcorp.com.au>,
	Xiao Guangrong <xiaoguangrong@...ux.vnet.ibm.com>
Subject: linux-next: manual merge of the kvm tree with the rr tree

Hi all,

Today's linux-next merge of the kvm tree got a conflict in
arch/x86/kvm/mmu.c between commit d6e5215aba76 ("module_param: make bool
parameters really bool (arch)") from the rr tree and commit d750ea28865d
("KVM: MMU: remove oos_shadow parameter") from the kvm tree.

The latter just removed the code modified by the former, so I did that.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped