Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts