From: Linus Torvalds Date: Thu, 23 May 2013 16:18:08 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/virt/kvm/kvm X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=72dd4e7980bf584fa11db4f00e38d5cf956a8856;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge git://git.kernel.org/pub/scm/virt/kvm/kvm Pull kvm bugfixes from Gleb Natapov. * git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock() KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a user visible API. KVM: take over co-maintainership from Marcelo, fix MAINTAINERS entry --- 72dd4e7980bf584fa11db4f00e38d5cf956a8856