Merge branch 'fixes' into next

diff --cc drivers/mmc/core/block.c
Simple merge

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

diff --cc drivers/mmc/host/mmc_spi.c
index d7a5bbeb391bbaee5c3fba7d0d651b556bc08870,8ade14fb2148dbcf8a8fa8087fdbb8dfbd1842ca..1b1498805972c7fdd9ff2640c55424ad7003760b
--- 1/drivers/mmc/host/mmc_spi.c
--- 2/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@@ -1450,9 -1450,10 +1450,10 @@@ static int mmc_spi_probe(struct spi_dev
                mmc->caps &= ~MMC_CAP_NEEDS_POLL;
                mmc_gpiod_request_cd_irq(mmc);
        }
+       mmc_detect_change(mmc, 0);
  
        /* Index 1 is write protect/read only */
 -      status = mmc_gpiod_request_ro(mmc, NULL, 1, false, 0, NULL);
 +      status = mmc_gpiod_request_ro(mmc, NULL, 1, 0, NULL);
        if (status == -EPROBE_DEFER)
                goto fail_add_host;
        if (!status)

diff --cc drivers/mmc/host/tmio_mmc_core.c
Simple merge