Hello Liu,
On Wed Jan 28, 2026 at 4:26 PM CET, Luca Ceresoli wrote:
quoted
Any reason why patch 3/3 is not applied?
Yes, the reason is there's a patch conflict and I still have to find out
how to handle it.
Patch 3 by the rules [0] should go to drm-misc-fixes because the bug (added
by [1]) is already on Linus' master tree (since v6.17), but it does not
apply there due to a conflict with an unrelated change [2] currently on
drm-misc-next.
Note that [1] and [2] are the two commits mentioned in your 'Fixes: 'tags.
I had a chat with Maxime on #dir-devel about how to handle this situation
but still haven't got a final answer.
I guess the correct way is:
1. apply patch 3 on drm-misc-next, where it applies cleanly
2. send a modified patch for drm-misc-fixes, to fix ASAP the master branch
Would you send the patch as in item 2, so it can be applied to
drm-misc-fixes and have master fixed ASAP? Note iit should not mention [2]
in the Fixes: tag because [2] is not yet on master. I can send it of course
but you can test on hardware so that would be the best option (and I'm a
bit overloaded at the moment).
Nevermind, I've just sent it:
https://lore.kernel.org/lkml/20260128-drm-bridge-fix-imx8qxp-pixel-combiner-null-deref-v1-0-2138d0933cf1@bootlin.com/ (local)
Luca
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com