diff options
author | Linus Torvalds | 2019-02-17 17:44:38 +0100 |
---|---|---|
committer | Linus Torvalds | 2019-02-17 17:44:38 +0100 |
commit | 8d33316d520501f24fef180ea5b860ecb9e64506 (patch) | |
tree | 4bbdca0d0a5022a65abc3af73745c930482073dd /drivers/gpu/drm/i915/i915_ioc32.c | |
parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | x86/platform/UV: Use efi_runtime_lock to serialise BIOS calls (diff) | |
download | kernel-qcow2-linux-8d33316d520501f24fef180ea5b860ecb9e64506.tar.gz kernel-qcow2-linux-8d33316d520501f24fef180ea5b860ecb9e64506.tar.xz kernel-qcow2-linux-8d33316d520501f24fef180ea5b860ecb9e64506.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Three changes:
- An UV fix/quirk to pull UV BIOS calls into the efi_runtime_lock
locking regime. (This done by aliasing __efi_uv_runtime_lock to
efi_runtime_lock, which should make the quirk nature obvious and
maintain the general policy that the EFI lock (name...) isn't
exposed to drivers.)
- Our version of MAGA: Make a.out Great Again.
- Add a new Intel model name enumerator to an upstream header to help
reduce dependencies going forward"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform/UV: Use efi_runtime_lock to serialise BIOS calls
x86/CPU: Add Icelake model number
x86/a.out: Clear the dump structure initially
Diffstat (limited to 'drivers/gpu/drm/i915/i915_ioc32.c')
0 files changed, 0 insertions, 0 deletions