Re: [PATCH v5 1/2] scsi: ufs: Do not disable vccq in UFSHC driver

From: Marc Gonzalez
Date: Tue Feb 26 2019 - 10:30:56 EST

[ Drop devs ]

On 26/02/2019 15:52, Martin K. Petersen wrote:

>>>> Revert the original patch, and clean up loose ends in the next patch.
>>> This commit isn't a revert. Why not?
>> What do you mean?
> Your commit states it reverts the original patch but the submission is
> not a git revert. If there are reasons why simply reverting the original
> commit didn't work, I'd like to see them documented in the commit
> message.


I indeed started off from 'git revert'

$ git revert 60f0187031c0
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 18258 and retry the command.
error: could not revert 60f0187031c0... scsi: ufs: disable vccq if it's not needed by UFS device
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

So I had to resolve the conflict in ufshcd_probe_hba()

The line:


was modified by commit 93fdd5ac64bbe80dac6416f048405362d7ef0945

It's not clear to me if you want me to

1) document that there was a conflict
2) change the title of the patch
3) both
4) something else altogether