Merge tag 'v5.5-rc5' into next

Sync up with mainline to get SPI "delay" API changes.