[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20191009133138.scz3i5jjcqt3gnjd@gilmour>
Date: Wed, 9 Oct 2019 15:31:38 +0200
From: Maxime Ripard <mripard@...nel.org>
To: Noralf Trønnes <noralf@...nnes.org>
Cc: Daniel Vetter <daniel@...ll.ch>, Jason Gunthorpe <jgg@...pe.ca>,
Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
Sean Paul <sean@...rly.run>, dri-devel@...ts.freedesktop.org,
sam@...nborg.org, hdegoede@...hat.com, linux-kernel@...r.kernel.org
Subject: Re: [1/3] drm/tinydrm/Kconfig: Remove menuconfig DRM_TINYDRM
On Wed, Oct 09, 2019 at 02:48:20PM +0200, Noralf Trønnes wrote:
> 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?
drm-misc-next-fixes is the branch where we gather fixes supposed to be
applied on top of drm-misc-next during the merge window. If you have
something targeting the current release, it should be drm-misc-fixes
indeed.
Maxime
Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)
Powered by blists - more mailing lists