On 23/10/2018 06:35, Can Guo wrote:
> From: Dov Levenglick <[email protected]>
>
> Enables core reset support. Add full initialization of the PHY and the
> controller before initializing UFS PHY and during link recovery.
>
> Signed-off-by: Dov Levenglick <[email protected]>
> Signed-off-by: Amit Nischal <[email protected]>
> Signed-off-by: Subhash Jadavani <[email protected]>
> Signed-off-by: Can Guo <[email protected]>
FWIW, this patch does not apply cleanly on top of v4.20-rc4 because
it clashes with df032bf27a414acf61c957ec2fad22a57d903b39
("scsi: ufs: Add a bsg endpoint that supports UPIUs").
Seems git's 3-way merge is smart enough to handle the conflict.
Regards.
