| commit | 9ad95bdacaa3296460fc23e31feaead1d4ffc8b9 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 22 Dec 2017 20:30:10 +0000 (22 12:30 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 22 Dec 2017 20:30:10 +0000 (22 12:30 -0800) | ||
| tree | a14e319a5c2abe31aa6542ecccf0f9e9545044ef | treesnapshot (tar.gz zip) |
| parent | fca0e39b2bd2fcfea2027845df28757943d9f561 | commitdiff |
| parent | b3cf8528bb21febb650a7ecbf080d0647be40b9f | commitdiff |
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
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
| arch/x86/xen/enlighten_pv.c | diff1 | diff2 | blobhistory |
| arch/x86/xen/mmu_pv.c | diff1 | diff2 | blobhistory |
| arch/x86/xen/setup.c | diff1 | diff2 | blobhistory |
| include/xen/balloon.h | diff1 | diff2 | blobhistory |