Merge 5.12-rc6 into char-misc-next