Merge "mmc: core: Update SD card removal logic based on cd gpio state"

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

diff --cc drivers/mmc/core/core.c
index 151643c,6423c39..e4e4e04
--- 1/drivers/mmc/core/core.c
--- 2/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@@ -4523,14 -4525,12 +4525,14 @@@ int mmc_pm_notify(struct notifier_bloc
        struct mmc_host *host = container_of(
                notify_block, struct mmc_host, pm_notify);
        unsigned long flags;
-       int err = 0;
+       int err = 0, present = 0;
  
        switch (mode) {
 +      case PM_RESTORE_PREPARE:
        case PM_HIBERNATION_PREPARE:
 +              if (host->bus_ops && host->bus_ops->pre_hibernate)
 +                      host->bus_ops->pre_hibernate(host);
        case PM_SUSPEND_PREPARE:
 -      case PM_RESTORE_PREPARE:
                spin_lock_irqsave(&host->lock, flags);
                host->rescan_disable = 1;
                spin_unlock_irqrestore(&host->lock, flags);

diff --cc include/linux/mmc/host.h
Simple merge