Merge tag 'v3.6-rc5' into for-linus