Merge existing fixes from spi/for-5.16 into new branch