From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Jun 2017 16:59:51 +0000 (-0700)
Subject: Merge tag 'for-linus-4.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.12-rc5~26
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/eb4125dfdb1f64a5e41da8315bff48f67e5d1712

Merge tag 'for-linus-4.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fix from Juergen Gross:
 "A fix for Xen on ARM when dealing with 64kB page size of a guest"

* tag 'for-linus-4.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/privcmd: Support correctly 64KB page granularity when mapping memory
---

eb4125dfdb1f64a5e41da8315bff48f67e5d1712