Merge tag 'v4.6-rc6' into x86/platform, to refresh the tree