linux-kernel - Re: linux-next: manual merge of the opp tree with the v4l-dvb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 24 Mar 2021 16:49:34 +0200
From:   Stanimir Varbanov <stanimir.varbanov@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Viresh Kumar <viresh.kumar@...aro.org>,
        Mauro Carvalho Chehab <mchehab@...nel.org>
Cc:     Bryan O'Donoghue <bryan.odonoghue@...aro.org>,
        Dmitry Osipenko <digetx@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Yangtao Li <tiny.windzz@...il.com>
Subject: Re: linux-next: manual merge of the opp tree with the v4l-dvb tree

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