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;
Date:   Thu, 25 Mar 2021 09:55:30 +0530
From:   Viresh Kumar <viresh.kumar@linaro.org>
To:     Stanimir Varbanov <stanimir.varbanov@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>
Subject: Re: linux-next: manual merge of the opp tree with the v4l-dvb tree
Message-ID: <20210325042530.5clexogqy77v75sm@vireshk-i7>
References: <20210323112705.3094525d@canb.auug.org.au>
 <20225c7e-1151-7865-2bc6-a1e5694c3d65@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20225c7e-1151-7865-2bc6-a1e5694c3d65@linaro.org>
User-Agent: NeoMutt/20180716-391-311a52
Precedence: bulk

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/

Can you please respond to this series then ?

-- 
viresh