From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
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>
Subject: Re: linux-next: manual merge of the opp tree with the v4l-dvb tree
Date: Thu, 25 Mar 2021 10:14:04 +0200 [thread overview]
Message-ID: <49a8bca3-d18b-9977-23c2-1dba6e61ef85@linaro.org> (raw)
In-Reply-To: <20210325042530.5clexogqy77v75sm@vireshk-i7>
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
next prev parent reply other threads:[~2021-03-25 8:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 0:27 linux-next: manual merge of the opp tree with the v4l-dvb tree Stephen Rothwell
2021-03-24 14:49 ` Stanimir Varbanov
2021-03-25 4:25 ` Viresh Kumar
2021-03-25 8:14 ` Stanimir Varbanov [this message]
2021-03-25 9:10 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49a8bca3-d18b-9977-23c2-1dba6e61ef85@linaro.org \
--to=stanimir.varbanov@linaro.org \
--cc=bryan.odonoghue@linaro.org \
--cc=digetx@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tiny.windzz@gmail.com \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).