]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - virt/kvm/arm/vgic/vgic-v3.c
Merge tag 'sunxi-fixes-for-4.15-2' of https://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Fri, 12 Jan 2018 00:59:50 +0000 (16:59 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 12 Jan 2018 00:59:50 +0000 (16:59 -0800)
commitbd730bfd100844acf4637b575e94cbafc0de426c
tree23605317a95dd50733661670e691de23a3bde257
parent9ddd0c131a1aaa9a0047ecdfac8e935aed0f7206
parentbdae44705c0d5b751fbd79bc4a169905b25ed335
Merge tag 'sunxi-fixes-for-4.15-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes

Allwinner fixes for 4.15, round 2

One fix that fixes the display pipeline description in the device tree
for the A10 and A20 SoCs. This description was introduced in 4.15-rc1
with a mismatch in the graph remote endpoints, which would likely
result in the driver misinterpreting how the individual components fit
together.

* tag 'sunxi-fixes-for-4.15-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun[47]i: Fix display backend 1 output to TCON0 remote endpoint

Signed-off-by: Olof Johansson <olof@lixom.net>