Merge branch 'fix/oss-header-fix' into for-linus