Merge tag 'v3.11-rc4' into spi-bitbang