Messages in this thread | | | Date | Mon, 2 Mar 2020 07:01:37 -0800 | From | Tony Lindgren <> | Subject | Re: [PATCH 1/3] drm/omap: Prepare DSS for probing without legacy platform data |
| |
* Tomi Valkeinen <tomi.valkeinen@ti.com> [200302 10:29]: > 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.
OK for resolving the merge commit that works too.
Tomi, so do you care to ack the $subject patch though so I can set up an immutable branch for us for the $subject patch?
Or Tomi, do you want to set up an immutable branch for me for the $subject patch?
Regards,
Tony
| |