Merge branch 'gic/cleanup' into next/soc