linux-next: manual merge of the scsi-mkp tree with the scsi-fixes tree

linux-next: manual merge of the scsi-mkp tree with the scsi-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/ufs/ufshcd.c

between commit:

  4ee7ee530bc2 ("scsi: ufs: Fix livelock of ufshcd_clear_ua_wluns()")

from the scsi-fixes tree and commit:

  9cd20d3f4736 ("scsi: ufs: Protect PM ops and err_handler from user access through sysfs")

from the scsi-mkp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/ufs/ufshcd.c
index e324cef1fd78,9b387d6a2a25..000000000000
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -6025,10 -6030,7 +6031,10 @@@ skip_err_handling
  	spin_unlock_irqrestore(hba->host->host_lock, flags);
  	ufshcd_scsi_unblock_requests(hba);
  	ufshcd_err_handling_unprepare(hba);
- 	up(&hba->eh_sem);
+ 	up(&hba->host_sem);
 +
 +	if (!err && needs_reset)
 +		ufshcd_clear_ua_wluns(hba);
  }
  
  /**

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]