Merge remote-tracking branch 'linux/master' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>