From: Linus Torvalds Date: Tue, 10 Mar 2015 01:59:50 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/virt/kvm/kvm X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=affb8172de395a6e1db52ed9790ca0456d8c29a9;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge git://git.kernel.org/pub/scm/virt/kvm/kvm Pull kvm/s390 bugfixes from Marcelo Tosatti. * git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: s390: non-LPAR case obsolete during facilities mask init KVM: s390: include guest facilities in kvm facility test KVM: s390: fix in memory copy of facility lists KVM: s390/cpacf: Fix kernel bug under z/VM KVM: s390/cpacf: Enable key wrapping by default --- affb8172de395a6e1db52ed9790ca0456d8c29a9