diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 02:49:45 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 02:49:45 +0200 |
commit | 8faef7125d02c0bbd7a1ceb4e3b599a9b8c42e58 (patch) | |
tree | 5d6c28a0f5654b5bae84e65dbb5563049b7b497e /ipc/shm.c | |
parent | Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | x86/jailhouse: Mark jailhouse_x2apic_available() as __init (diff) | |
download | linux-8faef7125d02c0bbd7a1ceb4e3b599a9b8c42e58.tar.xz linux-8faef7125d02c0bbd7a1ceb4e3b599a9b8c42e58.zip |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updayes from Ingo Molnar:
"Most of the commits add ACRN hypervisor guest support, plus two
cleanups"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/jailhouse: Mark jailhouse_x2apic_available() as __init
x86/platform/geode: Drop <linux/gpio.h> includes
x86/acrn: Use HYPERVISOR_CALLBACK_VECTOR for ACRN guest upcall vector
x86: Add support for Linux guests on an ACRN hypervisor
x86/Kconfig: Add new X86_HV_CALLBACK_VECTOR config symbol
Diffstat (limited to 'ipc/shm.c')
0 files changed, 0 insertions, 0 deletions