[GIT PULL] First batch of KVM changes for 4.15

Linus, test merge showed a conflict in arch/arm64/kvm/inject_fault.c and arch/arm/kvm/emulate.c that should be handled as in next. (The desired result is the same as "pull -s recursive -X theirs".) Also, a simple future merge conflict was reported with the kspp tree,

[GIT PULL] First batch of KVM changes for 4.15

Linus, test merge showed a conflict in arch/arm64/kvm/inject_fault.c and arch/arm/kvm/emulate.c that should be handled as in next. (The desired result is the same as "pull -s recursive -X theirs".) Also, a simple future merge conflict was reported with the kspp tree,