mmc: Merge branch fixes into next

Merge the mmc fixes for v6.17-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.18.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --cc drivers/memstick/core/memstick.c
Simple merge

diff --cc drivers/memstick/host/rtsx_usb_ms.c
Simple merge