Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts