Merge branch 'kvm-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-queue

A fix for a regression that is in current kvm/next, which is
targetted for 3.14.