On Tue, Jun 13, 2017 at 7:41 AM, Imre Deak <imre.deak@xxxxxxxxx> wrote:
> On Tue, Jun 13, 2017 at 06:57:44AM -0500, Bjorn Helgaas wrote:
>> On Tue, Jun 13, 2017 at 01:38:56PM +0300, Imre Deak wrote:
>> > commit 4d071c3238987325b9e50e33051a40d1cce311cc upstream.
>> >
>> > Some drivers - like i915 - may not support the system suspend direct
>> > complete optimization due to differences in their runtime and system
>> > suspend sequence. Add a flag that when set resumes the device before
>> > calling the driver's system suspend handlers which effectively disables
>> > the optimization.
>> >
>> > Needed by a future patch fixing suspend/resume on i915.
>> >
>> > Suggested by Rafael.
>> >
>> > Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>> > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
>> > Cc: <stable@xxxxxxxxxxxxxxx> # v4.8
>> > (rebased on v4.8, added kernel version to commit message stable tag)
>> > Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
>>
>> The signoff chain above is incorrect. It suggests that I wrote this
>> patch, but I did not.
>>
>> The chain on 4d071c323898 ("PCI/PM: Add needs_resume flag to avoid
>> suspend complete optimization") is:
>>
>> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
>> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
>> Cc: stable@xxxxxxxxxxxxxxx
>>
>> which indicates that Imre wrote the patch, and I received it from him
>> and merged it into the PCI tree.
>
> Yes, I moved my signoff to the end, since I rebased the original patch
> and updated the stable tag line to
>
> Cc: <stable@xxxxxxxxxxxxxxx> # v4.8
>
> tag. What's the proper way of signing off these changes, have two
> signed-off lines, keeping the original and add a new one at the end?
I don't actually know. Your proposal sounds reasonable to me.