diff options
author | Paul Mackerras <paulus@ozlabs.org> | 2018-01-19 02:09:57 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@ozlabs.org> | 2018-01-19 02:09:57 +0100 |
commit | d27998185da8fbdc35911307ae13518d168778d7 (patch) | |
tree | 4c5a99fd7cff7c9da1f858fdfccf8dc1cc6c597b /arch/x86/mm/pkeys.c | |
parent | KVM: PPC: Book3S HV: Allow HPT and radix on the same core for POWER9 v2.2 (diff) | |
parent | KVM: PPC: Book3S HV: Improve handling of debug-trigger HMIs on POWER9 (diff) | |
download | linux-d27998185da8fbdc35911307ae13518d168778d7.tar.xz linux-d27998185da8fbdc35911307ae13518d168778d7.zip |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the ppc-kvm topic branch of the powerpc tree to get
two patches which are prerequisites for the following patch series,
plus another patch which touches both powerpc and KVM code.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/x86/mm/pkeys.c')
0 files changed, 0 insertions, 0 deletions