Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: linux-next: manual merge of the opp tree with the v4l-dvb tree
To:     Viresh Kumar <viresh.kumar@linaro.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
        Dmitry Osipenko <digetx@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
        Yangtao Li <tiny.windzz@gmail.com>
References: <20210323112705.3094525d@canb.auug.org.au>
 <20225c7e-1151-7865-2bc6-a1e5694c3d65@linaro.org>
 <20210325042530.5clexogqy77v75sm@vireshk-i7>
From:   Stanimir Varbanov <stanimir.varbanov@linaro.org>
Message-ID: <49a8bca3-d18b-9977-23c2-1dba6e61ef85@linaro.org>
Date:   Thu, 25 Mar 2021 10:14:04 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.7.1
MIME-Version: 1.0
In-Reply-To: <20210325042530.5clexogqy77v75sm@vireshk-i7>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi Viresh,

On 3/25/21 6:25 AM, Viresh Kumar wrote:
> On 24-03-21, 16:49, Stanimir Varbanov wrote:
>> 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?
> 
> I already suggested something similar earlier, and I was expecting
> Thierry to respond to that.. Not sure who should pick those patches.
> 
> https://lore.kernel.org/lkml/20210318103250.shjyd66pxw2g2nsd@vireshk-i7/

I guess you meant this thread.

https://lore.kernel.org/lkml/20210314163408.22292-1-digetx@gmail.com/

> 
> Can you please respond to this series then ?
> 

Done.

-- 
regards,
Stan