From: "Martin K. Petersen" <martin.petersen@oracle.com>
To: Marc Gonzalez <marc.w.gonzalez@free.fr>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
SCSI <linux-scsi@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Jeffrey Hugo <jhugo@codeaurora.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Evan Green <evgreen@chromium.org>,
Douglas Anderson <dianders@chromium.org>,
Alim Akhtar <alim.akhtar@samsung.com>,
Avri Altman <avri.altman@wdc.com>,
Pedro Sousa <pedrom.sousa@synopsys.com>,
Joao Pinto <jpinto@synopsys.com>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Bart Van Assche <bart.vanassche@wdc.com>,
Stanislav Nijnikov <stanislav.nijnikov@wdc.com>,
Alex Lemberg <alex.lemberg@wdc.com>,
Ohad Sharabi <ohad.sharabi@wdc.com>,
Hannes Reinecke <hare@suse.de>, Kyuho Choi <kyuho.c>
Subject: Re: [PATCH v5 1/2] scsi: ufs: Do not disable vccq in UFSHC driver
Date: Tue, 26 Feb 2019 11:26:27 -0500 [thread overview]
Message-ID: <yq1y362bjnw.fsf@oracle.com> (raw)
In-Reply-To: <026c10b1-48e8-ab9f-fda8-6e3557b841a7@free.fr> (Marc Gonzalez's message of "Tue, 26 Feb 2019 16:30:09 +0100")
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
WARNING: multiple messages have this Message-ID (diff)
From: "Martin K. Petersen" <martin.petersen@oracle.com>
To: Marc Gonzalez <marc.w.gonzalez@free.fr>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
SCSI <linux-scsi@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Jeffrey Hugo <jhugo@codeaurora.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Evan Green <evgreen@chromium.org>,
Douglas Anderson <dianders@chromium.org>,
Alim Akhtar <alim.akhtar@samsung.com>,
Avri Altman <avri.altman@wdc.com>,
Pedro Sousa <pedrom.sousa@synopsys.com>,
Joao Pinto <jpinto@synopsys.com>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Bart Van Assche <bart.vanassche@wdc.com>,
Stanislav Nijnikov <stanislav.nijnikov@wdc.com>,
Alex Lemberg <alex.lemberg@wdc.com>,
Ohad Sharabi <ohad.sharabi@wdc.com>,
Hannes Reinecke <hare@suse.de>, Kyuho Choi <kyuho.choi@sk.com>
Subject: Re: [PATCH v5 1/2] scsi: ufs: Do not disable vccq in UFSHC driver
Date: Tue, 26 Feb 2019 11:26:27 -0500 [thread overview]
Message-ID: <yq1y362bjnw.fsf@oracle.com> (raw)
In-Reply-To: <026c10b1-48e8-ab9f-fda8-6e3557b841a7@free.fr> (Marc Gonzalez's message of "Tue, 26 Feb 2019 16:30:09 +0100")
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
next prev parent reply other threads:[~2019-02-26 16:26 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20190211133457epcas3p2dc95fa2c93c3cf884a376f0282be8b8a@epcas3p2.samsung.com>
2019-02-11 13:31 ` [PATCH v5 0/2] Clean up UFSHC driver Marc Gonzalez
2019-02-11 13:31 ` Marc Gonzalez
2019-02-11 13:32 ` [PATCH v5 1/2] scsi: ufs: Do not disable vccq in " Marc Gonzalez
2019-02-11 13:32 ` Marc Gonzalez
2019-02-11 17:23 ` Mark Brown
2019-02-11 17:23 ` Mark Brown
2019-02-13 10:05 ` Marc Gonzalez
2019-02-13 10:05 ` Marc Gonzalez
2019-02-26 9:05 ` Avri Altman
2019-02-26 9:05 ` Avri Altman
2019-02-26 14:44 ` Martin K. Petersen
2019-02-26 14:44 ` Martin K. Petersen
2019-02-26 14:45 ` Marc Gonzalez
2019-02-26 14:45 ` Marc Gonzalez
2019-02-26 14:52 ` Martin K. Petersen
2019-02-26 14:52 ` Martin K. Petersen
2019-02-26 15:30 ` Marc Gonzalez
2019-02-26 16:26 ` Martin K. Petersen [this message]
2019-02-26 16:26 ` Martin K. Petersen
2019-02-26 17:02 ` Marc Gonzalez
2019-02-26 20:00 ` Martin K. Petersen
2019-02-26 20:00 ` Martin K. Petersen
2019-02-11 13:33 ` [PATCH v5 2/2] scsi: ufs: Remove unused device quirks Marc Gonzalez
2019-02-11 13:33 ` Marc Gonzalez
2019-02-26 9:05 ` Avri Altman
2019-02-26 9:05 ` Avri Altman
2019-02-26 17:14 ` Evan Green
2019-02-26 17:14 ` Evan Green
2019-02-13 10:25 ` [PATCH v5 0/2] Clean up UFSHC driver Alim Akhtar
2019-02-13 10:25 ` Alim Akhtar
2019-02-23 9:39 ` Marc Gonzalez
2019-02-23 9:39 ` Marc Gonzalez
2019-02-26 8:57 ` Lee Jones
2019-02-26 8:57 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=yq1y362bjnw.fsf@oracle.com \
--to=martin.petersen@oracle.com \
--cc=alex.lemberg@wdc.com \
--cc=alim.akhtar@samsung.com \
--cc=avri.altman@wdc.com \
--cc=bart.vanassche@wdc.com \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=dianders@chromium.org \
--cc=evgreen@chromium.org \
--cc=hare@suse.de \
--cc=jhugo@codeaurora.org \
--cc=jpinto@synopsys.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=marc.w.gonzalez@free.fr \
--cc=ohad.sharabi@wdc.com \
--cc=pedrom.sousa@synopsys.com \
--cc=robh+dt@kernel.org \
--cc=stanislav.nijnikov@wdc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.