Merge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390...
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 27 Apr 2017 05:29:40 +0000 (07:29 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 27 Apr 2017 05:34:07 +0000 (07:34 +0200)
commitd0790fb6e5bc5a6bb923de9c2be7fc210d6b689b
tree06e5eda704d2aee3c15c47d8a8f095ba8beac0bc
parent284c43e6af415515865d2900d18d1382979c777c
parent152c1c8d60ebedce8cc912c12f9be9ceca6c6671
Merge branch 's390forkvm' of git://git./linux/kernel/git/kvms390/linux into features

Pull cpacf changes for KVM from Jason Herne:

Add query support for the KMA instruction.
arch/s390/include/asm/cpacf.h