Merge branch 'ovl-fixes' into for-linus