Hi Marc, > 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: > > ufs_advertise_fixup_device(hba); > > was modified by commit 93fdd5ac64bbe80dac6416f048405362d7ef0945 If it's a resolvable delta, a proper git revert is preferred. Please document any conflicts in the commit message and list the relevant commits that introduced them. If you find yourself in a situation where reverting simply isn't feasible, I'd expect the commit to state "This should have been a revert but I'd have to boil the oceans to resolve the conflicts because XYZ..." -- Martin K. Petersen Oracle Linux Engineering
