Merge tag 'v4.7' into for-linus/pstore