Merge branch 'stable/for-jens-4.12' of...

Merge branch 'stable/for-jens-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus

Pull a single fix from Konrad.