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

[Stephen Rothwell]

Hi all,

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

  drivers/ufs/core/ufshcd.c

between commit:

  86eb94bf8006 ("scsi: Revert "scsi: ufs: core: Initialize devfreq synchronously"")

from the scsi tree and commit:

  543a827b1db3 ("scsi: core: Clean up struct ufs_saved_pwr_info")

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/ufs/core/ufshcd.c
index c32a927ac5d1,03c47f9a2750..000000000000
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -8422,22 -8429,6 +8422,21 @@@ static int ufshcd_add_lus(struct ufs_hb
  	if (ret)
  		goto out;
  
 +	/* Initialize devfreq after UFS device is detected */
 +	if (ufshcd_is_clkscaling_supported(hba)) {
- 		memcpy(&hba->clk_scaling.saved_pwr_info.info,
++		memcpy(&hba->clk_scaling.saved_pwr_info,
 +			&hba->pwr_info,
 +			sizeof(struct ufs_pa_layer_attr));
- 		hba->clk_scaling.saved_pwr_info.is_valid = true;
 +		hba->clk_scaling.is_allowed = true;
 +
 +		ret = ufshcd_devfreq_init(hba);
 +		if (ret)
 +			goto out;
 +
 +		hba->clk_scaling.is_enabled = true;
 +		ufshcd_init_clk_scaling_sysfs(hba);
 +	}
 +
  	ufs_bsg_probe(hba);
  	ufshpb_init(hba);
  	scsi_scan_host(hba->host);

Attachment: pgpx9ieOY16c5.pgp
Description: OpenPGP digital signature