Merge 3.12-rc3 into char-misc-next