Hi Javier,
On Tue, Oct 31, 2023 at 11:11 AM Javier Martinez Canillas
<javierm@xxxxxxxxxx> wrote:
> Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> writes:
> > On Fri, Oct 27, 2023 at 11:33 AM Javier Martinez Canillas
> > <javierm@xxxxxxxxxx> wrote:
> >> Jocelyn Falempe <jfalempe@xxxxxxxxxx> writes:
> >> > On 21/10/2023 00:52, Javier Martinez Canillas wrote:
> >> >> Avoid a possible uninitialized use of the crtc_state variable in function
> >> >> ssd132x_primary_plane_atomic_check() and avoid the following Smatch warn:
> >> >>
> >> >> drivers/gpu/drm/solomon/ssd130x.c:921 ssd132x_primary_plane_atomic_check()
> >> >> error: uninitialized symbol 'crtc_state'.
> >> >
> >> > That looks trivial, so you can add:
> >> >
> >> > Acked-by: Jocelyn Falempe <jfalempe@xxxxxxxxxx>
> >> >
> >>
> >> Pushed to drm-misc (drm-misc-next). Thanks!
> >
> > Looks like you introduced an unintended
> >
> > (cherry picked from commit 9e4db199e66d427c50458f4d72734cc4f0b92948)
> >
> > ?
> >
>
> No, that's intended. It's added by the `dim cherry-pick` command, since I
> had to cherry-pick to drm-misc-next-fixes the commit that was already in
> the drm-misc-next branch.
>
> You will find that message in many drm commits, i.e:
>
> $ git log --oneline --grep="(cherry picked from commit" drivers/gpu/drm/ | wc -l
> 1708
Ah, so that's why it's (way too) common to have merge conflicts between
the fixes and non-fixes drm branches :-(
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
