Messages in this thread | | | From | Javier Martinez Canillas <> | Subject | Re: [PATCH] drm/ssd130x: Fix possible uninitialized usage of crtc_state variable | Date | Tue, 31 Oct 2023 12:27:05 +0100 |
| |
Geert Uytterhoeven <geert@linux-m68k.org> writes:
> Hi Javier,
[...]
>> >> 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 :-( >
I guess so. In this particular case it was my fault because I pushed to drm-misc-next with the expectation that there would be a last PR before the drm-next tree was sent to Torvalds but I missed for a few hours...
So then I had the option for the fixes to miss 6.7 and wait to land in 6.8, or cherry-pick them to the drm-misc-next-fixes branch and pollute the git history log :(
> Gr{oetje,eeting}s, > > Geert >
-- Best regards,
Javier Martinez Canillas Core Platforms Red Hat
| |