diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-05-27 13:47:59 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-05-27 13:47:59 -0700 |
commit | 2a16dc89be013e50283ec1461e5c1cc8bc24c474 (patch) | |
tree | 3b3c82501cc06506f2596435365099973ca81fba /drivers/gpu/drm/radeon/ni.c | |
parent | 0c94ab754b26e23ecdd6ddb1607c7a3e3f0f27fc (diff) | |
parent | 7e04a8803c644b0e1d90b59da24a6e1925082730 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' of https://git.linaro.org/people/shannon.zhao/linux-stable into linux-linaro-lsk-v3.14
Stable v3.14.43 contained an updated backport of KVM into the stable
tree, which conflicted with the previous backport in the LSK v3.14.
This merge combines them.
* 'linux-linaro-lsk-v3.14' of https://git.linaro.org/people/shannon.zhao/linux-stable: (52 commits)
Linux 3.14.43
kvm: arm64: vgic: fix hyp panic with 64k pages on juno platform
arm64: kvm: use inner-shareable barriers for inner-shareable maintenance
KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.
KVM: arm/arm64: vgic: fix GICD_ICFGR register accesses
ARM: KVM: trap VM system registers until MMU and caches are ON
ARM: KVM: add world-switch for AMAIR{0,1}
ARM: KVM: introduce per-vcpu HYP Configuration Register
ARM: KVM: fix ordering of 64bit coprocessor accesses
ARM: KVM: fix handling of trapped 64bit coprocessor accesses
ARM: KVM: force cache clean on page fault when caches are off
arm64: KVM: flush VM pages before letting the guest enable caches
ARM: KVM: introduce kvm_p*d_addr_end
arm64: KVM: trap VM system registers until MMU and caches are ON
arm64: KVM: allows discrimination of AArch32 sysreg access
arm64: KVM: force cache clean on page fault when caches are off
deal with deadlock in d_walk()
ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers.
ACPICA: Utilities: Cleanup to convert physical address printing formats.
ACPICA: Utilities: Cleanup to enforce ACPI_PHYSADDR_TO_PTR()/ACPI_PTR_TO_PHYSADDR().
...
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
0 files changed, 0 insertions, 0 deletions