* linux-next: manual merge of the kvm tree with the rr tree
@ 2011-12-28 4:17 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-12-28 4:17 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti
Cc: linux-next, linux-kernel, Rusty Russell, Xiao Guangrong
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-12-28 4:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-28 4:17 linux-next: manual merge of the kvm tree with the rr tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).