Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next