diff options
| author | Linus Torvalds <[email protected]> | 2016-08-18 11:17:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-08-18 11:17:13 -0700 |
| commit | f28535c100e3c3066ed3506d90948cf023dad21a (patch) | |
| tree | ae8656ed8772de974219a65b46fa04e8ef7655fd /drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | |
| parent | 114e3bae37a2976563fb7a678efe3cf3aff80ed2 (diff) | |
| parent | a93a4d62324123dcda383bdb4ab89151bbc0e499 (diff) | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Avoid a literal load with the MMU off on the CPU resume path
(potential inconsistency between cache and RAM)
- Build error with CONFIG_ACPI=n fixed
- Compiler warning in the arch/arm64/mm/dump.c code fixed
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: Fix shift warning in arch/arm64/mm/dump.c
arm64: kernel: avoid literal load of virtual address with MMU off
arm64: Fix NUMA build error when !CONFIG_ACPI
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c')
0 files changed, 0 insertions, 0 deletions