Simon,
On 06 Jun 2017, at 02:05, Simon Glass sjg@chromium.org wrote:
What’s the preferred way that you’d like this resolved: (a) wait until the HDMI-changes (in Anatolij’s tree) are merged to master, before applying this patch? (b) fix the issue in the older rk_hdmi.c (which doesn’t really have RK3399 support anyway) and deal with the conflict when the changeset from Anatolij’s tree trickled back down into the rockchip tree?
Can you send your pending patches rebased to rockchip/master and add a new patch to add the missing header? Then it will eitherbgoba at in my rebased or be sorted out by Tom.
I split this specific patch off into a new series that bundles this together with the fix for the ‘implicit definition’ warning for pre-RK3399 rk_hdmi.c. I hope that this will make tracking and resolving the eventual conflict a bit easier.
Regards, Philipp.