From: "Noralf Trønnes" <noralf@tronnes.org>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Jason Gunthorpe <jgg@ziepe.ca>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>, Sean Paul <sean@poorly.run>,
dri-devel@lists.freedesktop.org, sam@ravnborg.org,
hdegoede@redhat.com, linux-kernel@vger.kernel.org
Subject: Re: [1/3] drm/tinydrm/Kconfig: Remove menuconfig DRM_TINYDRM
Date: Wed, 9 Oct 2019 14:48:20 +0200 [thread overview]
Message-ID: <1bc77839-c47a-6e79-dd6e-e26e05b34eae@tronnes.org> (raw)
In-Reply-To: <20191009104531.GW16989@phenom.ffwll.local>
Den 09.10.2019 12.45, skrev Daniel Vetter:
> 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 remembered that Maxime just sent out a fixes pull and the subject says
drm-misc-fixes. The prevous one he sent out was -next-fixes.
So it looks like I should cherry pick to drm-misc-fixes for it to show
up in 5.4?
Noralf.
>> (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@tronnes.org>
>>>>>> Reviewed-by: Hans de Goede <hdegoede@redhat.com> 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
>>>
>
next prev parent reply other threads:[~2019-10-09 12:48 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 10:51 [PATCH 0/3] drm/tinydrm: Rename to drm/tiny Noralf Trønnes
2019-07-25 10:51 ` [PATCH 1/3] drm/tinydrm/Kconfig: Remove menuconfig DRM_TINYDRM Noralf Trønnes
2019-07-30 13:19 ` Hans de Goede
2019-07-30 13:34 ` Noralf Trønnes
2019-07-30 13:35 ` Hans de Goede
2019-07-30 13:53 ` Emil Velikov
2019-07-30 14:03 ` Noralf Trønnes
2019-07-30 14:16 ` Emil Velikov
2019-10-01 12:36 ` [1/3] " Jason Gunthorpe
2019-10-01 13:28 ` Noralf Trønnes
2019-10-01 13:28 ` Noralf Trønnes
2019-10-01 13:45 ` Jason Gunthorpe
2019-10-01 14:07 ` Noralf Trønnes
2019-10-09 10:45 ` Daniel Vetter
2019-10-09 10:45 ` Daniel Vetter
2019-10-09 12:48 ` Noralf Trønnes [this message]
2019-10-09 13:31 ` Maxime Ripard
2019-10-10 13:30 ` Noralf Trønnes
2019-10-10 13:30 ` Noralf Trønnes
2019-07-25 10:51 ` [PATCH 2/3] drm/tinydrm: Rename folder to tiny Noralf Trønnes
2019-07-25 10:51 ` [PATCH 3/3] drm/gm12u320: Move driver to drm/tiny Noralf Trønnes
2019-07-25 12:06 ` [PATCH 0/3] drm/tinydrm: Rename " Daniel Vetter
2019-07-25 12:46 ` Noralf Trønnes
2019-07-25 15:10 ` Sam Ravnborg
2019-07-31 13:32 ` Noralf Trønnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1bc77839-c47a-6e79-dd6e-e26e05b34eae@tronnes.org \
--to=noralf@tronnes.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=jgg@ziepe.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.