Merge branch 'work-linus' into work-next

Signed-off-by: Eduardo Valentin <edubezval@gmail.com>