aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-09-09 13:24:19 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-09-11 09:47:49 +0200
commit6999c7e28e3a6c7a4b0ce59417a712cef7eb459c (patch)
tree31a9fe3ff932e5af2ae037eed18c19ddf0a2c2c4 /target/linux/layerscape/patches-4.14
parent3b6b66529ff0e9c7dba6fd28972beda99b07b29e (diff)
downloadupstream-6999c7e28e3a6c7a4b0ce59417a712cef7eb459c.tar.gz
upstream-6999c7e28e3a6c7a4b0ce59417a712cef7eb459c.tar.bz2
upstream-6999c7e28e3a6c7a4b0ce59417a712cef7eb459c.zip
kernel: bump 4.14 to 4.14.142
Refreshed all patches. Remove upstreamed: - 0032-usb-host-fotg2-restart-hcd-after-port-reset.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.14')
-rw-r--r--target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch
index 2d26637894..502a99fa87 100644
--- a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch
@@ -196,7 +196,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com>
--- a/virt/kvm/arm/vgic/vgic-v2.c
+++ b/virt/kvm/arm/vgic/vgic-v2.c
-@@ -304,7 +304,8 @@ int vgic_v2_map_resources(struct kvm *kv
+@@ -307,7 +307,8 @@ int vgic_v2_map_resources(struct kvm *kv
if (!static_branch_unlikely(&vgic_v2_cpuif_trap)) {
ret = kvm_phys_addr_ioremap(kvm, dist->vgic_cpu_base,
kvm_vgic_global_state.vcpu_base,