Merge branch 'char-misc-linus' into char-misc-next