Thanks Stephen!
On 3/23/21 2:27 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the opp tree got a conflict in:
>
> drivers/media/platform/qcom/venus/pm_helpers.c
>
> between commit:
>
> 08b1cf474b7f ("media: venus: core, venc, vdec: Fix probe dependency error")
>
> from the v4l-dvb tree and commit:
>
> 857219ae4043 ("media: venus: Convert to use resource-managed OPP API")
>
> from the opp tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
I don't know what is the best solution here.
Viresh, Can I take the OPP API changes through media-tree to avoid
conflicts?
--
regards,
Stan
