Merge commit 'v3.0-rc7' into devicetree/next