Merge existing fixes from spi/for-5.15