Merge branches 'upstream', 'upstream-fixes' and 'debugfs' into for-linus