Merge branch 'v3-dev'

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