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@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpBoIKYhq3RF.pgp
Description: PGP signature