On 27/02/2020 19:44, Tony Lindgren wrote:
FWIW, I dropped omapdss-boot-init.c in my patch series updating DSI
code to use common panel infrastructure, so this will conflict.
Hey that's great :) Sounds like we can set up an immutable branch
for just this $subject patch against v5.6-rc1 to resolve the
conflict. I can set it up for Tomi or Tomi can set it up for me,
whichever Tomi prefers.
Do you want me to send you a pull request for just this one patch
against v5.6-rc1?
It's probably easier if Sebastian drops the removal patch, and instead creates a patch that removes
the panel-dsi-cm from omapdss_of_fixups_whitelist. That change should not conflict, and effectively
makes the omapdss-boot-init.c a no-op.
We can then remove the file later.
Tomi
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
