Re: [1/3] drm/tinydrm/Kconfig: Remove menuconfig DRM_TINYDRM

From: Daniel Vetter
Date: Wed Oct 09 2019 - 06:45:39 EST


On Tue, Oct 01, 2019 at 04:07:38PM +0200, Noralf Trønnes wrote:
> Hi drm-misc maintainers,
>
> I have just applied a patch to drm-misc-next that as it turns out should
> have been applied to -fixes for this -rc cycle.
>
> Should I cherry pick it to drm-misc-next-fixes?

Yup, cherry pick and reference the commit that's already in -next (in case
it creates conflicts down the road that reference makes the mess easier to
understand).

> (I know there's a flowchart in the docs but I've never really understood
> it.)

Usually bugfixes for kernel releases should land in drm-misc-next-fixes or
drm-misc-fixes. But cherry-picking over in case of mistakes is ok too.
-Daniel

>
> Noralf.
>
> Den 01.10.2019 15.45, skrev Jason Gunthorpe:
> > On Tue, Oct 01, 2019 at 03:28:46PM +0200, Noralf Trønnes wrote:
> >>
> >>
> >> Den 01.10.2019 14.36, skrev Jason Gunthorpe:
> >>> On Thu, Jul 25, 2019 at 12:51:30PM +0200, Noralf Trønnes wrote:
> >>>> This makes the tiny drivers visible by default without having to enable a
> >>>> knob.
> >>>>
> >>>> Signed-off-by: Noralf Trønnes <noralf@xxxxxxxxxxx>
> >>>> Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx> to it once
> >>>> drivers/gpu/drm/Makefile | 2 +-
> >>>> drivers/gpu/drm/tinydrm/Kconfig | 37 +++++++++++++++++++--------------
> >>>> 2 files changed, 22 insertions(+), 17 deletions(-)
> >>>
> >>> Bisection says this patch (28c47e16ea2a19adb47fe2c182cbd61cb854237c)
> >>> breaks kconfig stuff in v5.4-rc by creating circular
> >>> dependencies. Could someone send a -rc patch to fix this please?
> >>>
> >>> THINKPAD_ACPI (defined at drivers/platform/x86/Kconfig:484), with definition...
> >>> ...depends on FB_SSD1307 (defined at drivers/video/fbdev/Kconfig:2259), with definition...
> >>> ...depends on FB (defined at drivers/video/fbdev/Kconfig:12), with definition...
> >>> ...depends on DRM_KMS_FB_HELPER (defined at drivers/gpu/drm/Kconfig:79), with definition...
> >>> ...depends on DRM_KMS_HELPER (defined at drivers/gpu/drm/Kconfig:73), with definition...
> >>> ...depends on TINYDRM_REPAPER (defined at drivers/gpu/drm/tinydrm/Kconfig:51), with definition...
> >>> ...depends on THERMAL (defined at drivers/thermal/Kconfig:6), with definition...
> >>> ...depends on SENSORS_NPCM7XX (defined at drivers/hwmon/Kconfig:1285), with definition...
> >>> ...depends on HWMON (defined at drivers/hwmon/Kconfig:6), with definition...
> >>> ...depends on THINKPAD_ACPI (defined at drivers/platform/x86/Kconfig:484), with definition...
> >>> ...depends on ACPI_VIDEO (defined at drivers/acpi/Kconfig:193), with definition...
> >>> ...depends on ACER_WMI (defined at drivers/platform/x86/Kconfig:19), with definition...
> >>> ...depends on BACKLIGHT_CLASS_DEVICE (defined at drivers/video/backlight/Kconfig:144), with definition...
> >>> ...depends again on THINKPAD_ACPI (defined at drivers/platform/x86/Kconfig:484)
> >>>
> >>
> >> Would this commit fix this by any chance:
> >>
> >> drm/tiny: Kconfig: Remove always-y THERMAL dep. from TINYDRM_REPAPER
> >> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=dfef959803c728c616ad29b008cd91b3446a993a
> >
> > Yes, thank you, can someone send this to -rc to unbreak 5.4?
> >
> > Jason
> >

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch