[PATCH] drm/xe/xe_gt_idle: Fix name conflict

[Riana Tauro]

On 9/10/2024 11:15 PM, Rodrigo Vivi wrote:
> On Tue, Sep 10, 2024 at 01:23:41PM -0400, Rodrigo Vivi wrote:
>> On Tue, Sep 10, 2024 at 11:48:20AM -0500, Lucas De Marchi wrote:
>>> On Tue, Sep 10, 2024 at 09:55:23PM GMT, Riana Tauro wrote:
>>>> Hi Rodrigo/ Matthew
>>>>
>>>> There was an error when this change was merged to linux-next
>>>> https://lore.kernel.org/r/20240909195939.067c1c13@canb.auug.org.au
>>>>
>>>> The conflict was because the below commit
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git/commit/?h=for-next/hardening&id=3ff37dbb1ae9926d3b51749f7d0d3f474fe2440b
>>>>
>>>> Jani suggested to rename or remove it in
>>>> https://patchwork.freedesktop.org/patch/612760/?series=136477&rev=5.
>>>>
>>>> Removed it for now, will add it once the commit is in the tree
>>>
>>> I think this should just be solved as normal merge conflict.
>>>
>>> It's already solved in linux-next with the right conflict resolution,
>>> which is to drop the local helper from drivers/gpu/drm/xe/xe_gt_idle.c
>>> and just use the helper from include/linux/string_choices.h.
>>> No need to drop it here and then eventually bringing the same change
>>> back.
>>
>> Well, indeed. Since the function is exactly the same let's just do it.
> 
> On a second thought, this can be bad, because this conflict will need to be
> solved over and over again. It is silent (only detected at bug failure).
> And the worst part is the inclusion of a line (#include <linux/string_choices.h>)
> in the conflict resolution.
Inclusion of the header file is not needed as other functions 
(str_yes_or_no) from same file are used in gt_idle.

If https://lore.kernel.org/r/20240909195939.067c1c13@canb.auug.org.au 
would be taken eventually, should i just drop the correction?

Thanks,
Riana
> 
>>
>>>
>>> Lucas De Marchi