Merge tag 'v4.7-rc6' into x86/mm, to merge fixes before applying new changes