From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Dec 2017 20:30:10 +0000 (-0800)
Subject: Merge tag 'for-linus-4.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9ad95bdacaa3296460fc23e31feaead1d4ffc8b9;p=linux.git

Merge tag 'for-linus-4.15-rc5-tag' of git://git./linux/kernel/git/xen/tip

Pull xen fixes from Juergen Gross:
 "This contains two fixes for running under Xen:

   - a fix avoiding resource conflicts between adding mmio areas and
     memory hotplug

   - a fix setting NX bits in page table entries copied from Xen when
     running a PV guest"

* tag 'for-linus-4.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/balloon: Mark unallocated host memory as UNUSABLE
  x86-64/Xen: eliminate W+X mappings
---

9ad95bdacaa3296460fc23e31feaead1d4ffc8b9