On 10/23/26 10:51 AM, Thomas Zimmermann wrote:
> Hi
>
> Am 22.10.26 um 19:55 schrieb Sasha Levin:
>> Commit 08abfa5a161e ("drivers: Replace __MODULE_STRING() with
>> __stringify()") converted the drm_fbdev_overalloc parameter description
>> in drm_fb_helper.c ahead of the removal of __MODULE_STRING().
>>
>> Commit 6b5a66fd9f21 ("drm/fbdev: Move fbdev module parameters next to
>> module init") moved that parameter into drm_kms_helper_common.c while it
>> still used __MODULE_STRING(), so the conversion never reached the moved
>> code. drm_kms_helper_common.c is now the last user of the macro, and
>> removing the macro breaks the build with CONFIG_DRM_FBDEV_EMULATION=y:
>>
>> drivers/gpu/drm/drm_kms_helper_common.c:46:18: error: expected ')' before
>> '__MODULE_STRING'
>>
>> Use __stringify() instead. The parameter description is unchanged.
>>
>> Signed-off-by: Sasha Levin <[email protected]>
>
> Reviewed-by: Thomas Zimmermann <[email protected]>
>
>> ---
>> This depends on 6b5a66fd9f21 in drm-next and 08abfa5a161e in
>> modules-next, both queued for 7.4. Petr plans to remove
>> __MODULE_STRING() once his conversions are in mainline, so this needs to
>> land first, either through drm-misc after 7.4-rc1 or together with the
>> removal patch.
>
> Dave, could we put this patch directly into drm-next? It seems like this
> fixes a broken merge commit.
It looks like Linus took care of this. Merge commit 5b0764a53235 ("Merge
tag 'drm-next-2026-10-21' of https://gitlab.freedesktop.org/drm/kernel";)
updated drivers/gpu/drm/drm_kms_helper_common.c to use __stringify()
instead of __MODULE_STRING(). The current mainline has no remaining uses of
__MODULE_STRING().
--
Thanks,
Petr
