Re: [PATCH V2] scsi: ufs-pci: Add LTR support for Intel controllers

[Adrian Hunter]

On 9/09/20 5:06 pm, Adrian Hunter wrote:
> On 2/09/20 12:27 pm, Adrian Hunter wrote:
>> On 2/09/20 5:12 am, Martin K. Petersen wrote:
>>>
>>> Adrian,
>>>
>>>> Intel host controllers support the setting of latency tolerance.
>>>> Accordingly, implement the PM QoS ->set_latency_tolerance() callback. The
>>>> raw register values are also exposed via debugfs.
>>>
>>> Does not apply to 5.10/scsi-queue. Please rebase. Thanks!
>>>
>>
>> Hi
>>
>> Thanks for processing this.
>>
>> The 5.10/scsi-queue branch seems to be missing the following fix.  If you cherry
>> pick that, then it applies.
> 
> Now there seem to be conflicts between 5.10/scsi-queue and v5.9-rc4.
> I am not sure what I can do?

Now I see it does apply to James' for-next branch.  Can it be applied there?