2016-07-19 13:56+0100, Marc Zyngier:

The kprobe enablement work has uncovered that changes made by
a guest to MDSCR_EL1 were propagated to the host when VHE was
enabled, leading to unexpected exception being delivered.

Moving this register to the list of registers that are always
context-switched fixes the issue.

Fixes: 9c6c35683286 ("arm64: KVM: VHE: Split save/restore of registers shared between guest and host")
Cc: stable at vger.kernel.org #4.6
Reported-by: Tirumalesh Chalamarla <redacted>
Tested-by: Tirumalesh Chalamarla <redacted>
Signed-off-by: Marc Zyngier <redacted>
---

I would take this patch to 4.7 directly through the main tree.
Are your plans different?

Thanks.