On 23/10/2018 06:35, Can Guo wrote: > From: Dov Levenglick <dovl@xxxxxxxxxxxxxx> > > 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 <dovl@xxxxxxxxxxxxxx> > Signed-off-by: Amit Nischal <anischal@xxxxxxxxxxxxxx> > Signed-off-by: Subhash Jadavani <subhashj@xxxxxxxxxxxxxx> > Signed-off-by: Can Guo <cang@xxxxxxxxxxxxxx> 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.