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

diff --cc drivers/spi/spi-mem.c
Simple merge

diff --cc drivers/spi/spi-qpic-snand.c
Simple merge