Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git

diff --cc drivers/ufs/core/ufshcd.c
index 1893a7ad95316b45bb4a554fcb743b64c0a257d3,ef56a5eb52dcc36d26502f4fa6d9548fdd0d315a..3c3f2101a4a5b2315c5ce1da7b8115ae4220e683
--- 1/drivers/ufs/core/ufshcd.c
--- 2/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -6199,8 -6214,13 +6199,13 @@@ static void ufshcd_exception_event_hand
                ufshcd_bkops_exception_event_handler(hba);
  
        if (status & hba->ee_drv_mask & MASK_EE_URGENT_TEMP)
 -              ufshcd_temp_exception_event_handler(hba, status);
 +              ufs_hwmon_notify_event(hba, status & MASK_EE_URGENT_TEMP);
  
+       if (status & hba->ee_drv_mask & MASK_EE_HEALTH_CRITICAL) {
+               hba->critical_health_count++;
+               sysfs_notify(&hba->dev->kobj, NULL, "critical_health");
+       }
+ 
        ufs_debugfs_exception_event(hba, status);
  }
  

diff --cc drivers/ufs/host/ufs-exynos.c
Simple merge

diff --cc drivers/ufs/host/ufs-qcom.c
Simple merge

diff --cc drivers/ufs/host/ufshcd-pci.c
Simple merge

diff --cc include/ufs/ufs.h
Simple merge

diff --cc include/ufs/ufshcd.h
Simple merge