diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-16 19:40:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-16 19:40:24 -0700 |
| commit | 7ac63f6ba5db5e2e81e4674551d6f9ec58e70618 (patch) | |
| tree | fae597509e6781401b6abb517dac17f663737a34 /MAINTAINERS | |
| parent | e2bddc20b562ee23046ad541cf29314e4aebd934 (diff) | |
| parent | f7b15c74cffd760ec9959078982d8268a38456c4 (diff) | |
| download | linux-7ac63f6ba5db5e2e81e4674551d6f9ec58e70618.tar.bz2 | |
Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 vmware updates from Ingo Molnar:
"This updates the VMWARE guest driver with support for VMCALL/VMMCALL
based hypercalls"
* 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
input/vmmouse: Update the backdoor call with support for new instructions
drm/vmwgfx: Update the backdoor call with support for new instructions
x86/vmware: Add a header file for hypercall definitions
x86/vmware: Update platform detection code for VMCALL/VMMCALL hypercalls
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 49f75d1b7b51..2ca0b600d56f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17193,6 +17193,7 @@ M: "VMware, Inc." <pv-drivers@vmware.com> L: virtualization@lists.linux-foundation.org S: Supported F: arch/x86/kernel/cpu/vmware.c +F: arch/x86/include/asm/vmware.h VMWARE PVRDMA DRIVER M: Adit Ranadive <aditr@vmware.com> |