On Tue, Oct 20, 2020 at 01:57:11PM +0200, Guido Günther wrote:
> Hi Daniel, Sam,
> On Mon, Oct 19, 2020 at 05:44:37PM +0200, Daniel Vetter wrote:
> > On Sat, Oct 17, 2020 at 12:47:36PM +0200, Sam Ravnborg wrote:
> > > Hi Guido.
> > >
> > > On Sat, Oct 17, 2020 at 11:13:07AM +0200, Guido Günther wrote:
> > > > Hi Sam,
> > > > On Fri, Oct 16, 2020 at 04:29:16PM +0200, Sam Ravnborg wrote:
> > > > > Hi Guido.
> > > > > On Tue, Oct 13, 2020 at 12:32:45PM +0200, Guido Günther wrote:
> > > > [..snip..]
> > > > > >
> > > > > > Changes from v1:
> > > > > > - As per review comments by Fabio Estevam
> > > > > >
> > > > > > https://lore.kernel.org/dri-devel/CAOMZO5B5ECcConvKej=rcaf8wvoxgq7nuzkj-ad0asaozuq...@mail.gmail.com/
> > > > > > - Fix typo in commit messages
> > > > > > - As per review comments by Rob Herring
> > > > > > https://lore.kernel.org/dri-devel/20200929174624.GA832332@bogus/
> > > > > > - Don't use an array of reset lines
> > > > > >
> > > > > > Guido Günther (3):
> > > > > > drm/panel: mantix: Don't dereference NULL mode
> > > > > > drm/panel: mantix: Fix panel reset
> > > > > > dt-binding: display: Require two resets on mantix panel
> > > > >
> > > > > All applied to drm-misc-next and pushed out.
> > > > > And then I remembered you had commit right - sigh.
> > > >
> > > > Thanks! Is there any special care needed to get that into 5.10? The
> > > > driver landed there in 72967d5616d3f0c714f8eb6c4e258179a9031c45.
> > >
> > > As the patches was applied to drm-misc-next the easiet path would
> > > be to cherry-pick them and apply to drm-misc-fixes.
> > > dim has cherry-pick support - try to use it rahter than doing it by
> > > hand.
> >
> > drm-misc-next-fixes while we're between freeze and merge window end:
> >
> > https://drm.pages.freedesktop.org/maintainer-tools/committer-drm-misc.html#where-do-i-apply-my-patch
>
> Great. Thanks for the pointer, that works. Now i get:
>
> $ ../maintainer-tools/dim push --dry-run
> dim: 3532f0117258 ("dt-binding: display: Require two resets on mantix
> panel"): mandatory review missing.
> dim: c90f95ad6d05 ("drm/panel: mantix: Fix panel reset"): mandatory review
> missing.
> dim: 8b557f793e69 ("drm/panel: mantix: Don't dereference NULL mode"):
> mandatory review missing.
> dim: ERROR: issues in commits detected, aborting
Ah yes, if author != committer then dim assumes there has been some
oversight and review.
But when you cherry-pick over then it's again author == committer and in
that case dim is looking for an a-b or r-b line, hence why the cherry-pick
fails.
For a bit of context.
-Daniel
> and in fact there's only Signed-off-by's on it:
>
> Fixes: 72967d5616d3 ("drm/panel: Add panel driver for the Mantix
> MLAF057WE51-X DSI panel")
> Signed-off-by: Guido Günther <a...@sigxcpu.org>
> Signed-off-by: Sam Ravnborg <s...@ravnborg.org>
> Link:
> https://patchwork.freedesktop.org/patch/msgid/ba71a8ab010d263a8058dd4f711e3bcd95877bf2.1602584953.git....@sigxcpu.org
>
> Sam, I assume your Signed-off-by's should have been Reviewed-by ?
> O.k. to fix that up in the commit message before pushing to
> drm-misc-next?
>
> Cheers,
> -- Guido
>
> >
> > Cheers, Daniel
> >
> > >
> >
> > > When you apply to drm-misc-fixes include a Fixes: tag so the tooling
> > > will pick the patches automagically.
> > >
> > > In hindsight the patches should have carried a Fixes: tag from a start
> > > and should have been applied to drm-misc-fixes from a start too.
> > >
> > > I have done something like above once or twice but anyway reach out if
> > > you have questions. Or ask at #dri-devel.
> > >
> > > Sam
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
> >
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
