Merge tag 'v6.18.5' into for/openbmc/dev-6.18

This is the 6.18.5 stable release