From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 10 Mar 2016 16:06:07 +0000 (+0100)
Subject: Merge tag 'kvm-s390-next-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f958ee745f70b60d0e41927cab2c073104bc70c2;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'kvm-s390-next-4.6-2' of git://git./linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Fixes and features for kvm/next (4.6) part 2

- add watchdog diagnose to trace event decoder
- better handle the cpu timer when not inside the guest
- only provide STFLE if the CPU model has STFLE
- reduce DMA page usage
---

f958ee745f70b60d0e41927cab2c073104bc70c2