Merge v5.12-rc3 into char-misc-next