From: Matthias Brugger <matthias.bgg@gmail.com>
To: "andrew-sh.cheng" <andrew-sh.cheng@mediatek.com>,
Chanwoo Choi <cw00.choi@samsung.com>
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Viresh Kumar <viresh.kumar@linaro.org>,
Nishanth Menon <nm@ti.com>, Stephen Boyd <sboyd@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
srv_heupstream@mediatek.com
Subject: Re: [PATCH 00/12] Add cpufreq and cci devfreq for mt8183, and SVS support
Date: Wed, 20 May 2020 16:53:07 +0200 [thread overview]
Message-ID: <6874cc1e-275f-9d17-045b-c717c307da9c@gmail.com> (raw)
In-Reply-To: <1589958625.23971.2.camel@mtksdaap41>
On 20/05/2020 09:10, andrew-sh.cheng wrote:
> On Wed, 2020-05-20 at 15:24 +0900, Chanwoo Choi wrote:
>> Hi,
>>
>> On 5/20/20 2:36 PM, andrew-sh.cheng wrote:
>>> On Wed, 2020-05-20 at 13:10 +0900, Chanwoo Choi wrote:
>>>> Hi Andrew,
>>>>
>>>> Could you explain the base commit of these patches?
>>>> When I tried to apply them to v5.7-rc1 for testing,
>>>> the merge conflict occurs.
>>>>
>>>> Thanks,
>>
>>>> Chanwoo Choi
>>>
>>> Hi Chanwoo Choi,
>>>
>>> My base commit is
>>> commit 8f3d9f354286745c751374f5f1fcafee6b3f3136
>>> Author: Linus Torvalds <torvalds@linux-foundation.org>
>>> Date: Sun Apr 12 12:35:55 2020 -0700
>>>
>>> Linux 5.7-rc1
>>>
>>> Could you show me the conflict error?
>>
>>
>> When I tried to apply first patch with 'git am',
>> the merge conflict occurred.
>>
>> git am \[PATCH\ 01_12\]\ OPP\:\ Allow\ required-opps\ even\ if\ the\ device\ doesn\'t\ have\ power-domains.eml
>> Applying: OPP: Allow required-opps even if the device doesn't have power-domains
>> error: patch failed: drivers/opp/core.c:755
>> error: drivers/opp/core.c: patch does not apply
>> error: patch failed: drivers/opp/of.c:195
>> error: drivers/opp/of.c: patch does not apply
>> Patch failed at 0001 OPP: Allow required-opps even if the device doesn't have power-domains
>> Use 'git am --show-current-patch' to see the failed patch
>> When you have resolved this problem, run "git am --continue".
>> If you prefer to skip this patch, run "git am --skip" instead.
>> To restore the original branch and stop patching, run "git am --abort".
>>
>> Regards,
>> Chanwoo Choi
>
> Hi Chanwoo,
>
> I just make a new folder to get code and check.
> Below is my command list.
> Please help check the different with you.
> 505 repo init -u http://gerrit.mediatek.inc:8080/cros-kernel/manifest
> -b upstream
> 506 repo sync -j8
> 507 repo start kern-dev --all
> 508 git remote add main
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> 509 git remote add main
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> 510 ls
> 511 cd kernel/mediatek/
> 512 git remote add main
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> 513 git fetch main
> 514 git checkout v5.7-rc1
> 515 git am
> Add-cpufreq-and-cci-devfreq-for-mt8183-and-SVS-support.patch
> 516 history
>
For reference I just tried with b4.sh [1]:
# b4.sh am -l -o /tmp -n patch 1589958625.23971.2.camel@mtksdaap41
# git am -3 -s /tmp/patch.mbx
Applies without conflicts.
Regards,
Matthias
[1] https://git.kernel.org/pub/scm/utils/b4/b4.git
next prev parent reply other threads:[~2020-05-20 14:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200520034324epcas1p3affbd24bd1f3fe40d51baade07c1abba@epcas1p3.samsung.com>
[not found] ` <20200520034307.20435-1-andrew-sh.cheng@mediatek.com>
2020-05-20 4:10 ` [PATCH 00/12] Add cpufreq and cci devfreq for mt8183, and SVS support Chanwoo Choi
[not found] ` <1589953015.8243.2.camel@mtksdaap41>
2020-05-20 6:24 ` Chanwoo Choi
[not found] ` <1589958625.23971.2.camel@mtksdaap41>
2020-05-20 14:53 ` Matthias Brugger [this message]
[not found] ` <20200520034307.20435-10-andrew-sh.cheng@mediatek.com>
2020-05-20 12:31 ` [PATCH 09/12] devfreq: add mediatek cci devfreq Mark Brown
2020-05-21 8:52 ` andrew-sh.cheng
2020-05-28 7:35 ` Chanwoo Choi
2020-05-28 8:00 ` Chanwoo Choi
[not found] ` <20200520034307.20435-2-andrew-sh.cheng@mediatek.com>
2020-05-20 14:54 ` [PATCH 01/12] OPP: Allow required-opps even if the device doesn't have power-domains Matthias Brugger
[not found] ` <CGME20200520034335epcas1p45a321a1a878fb7cd7b9c9ada0a474ef7@epcas1p4.samsung.com>
[not found] ` <20200520034307.20435-7-andrew-sh.cheng@mediatek.com>
2020-05-28 5:03 ` [PATCH 06/12] PM / devfreq: Add cpu based scaling support to passive_governor Chanwoo Choi
2020-05-28 6:14 ` Chanwoo Choi
2020-05-28 7:17 ` Chanwoo Choi
[not found] ` <1591100614.1804.1.camel@mtksdaap41>
2020-06-03 4:12 ` Chanwoo Choi
[not found] ` <1591098190.30729.15.camel@mtksdaap41>
2020-06-03 4:07 ` Chanwoo Choi
[not found] ` <CGME20200520034339epcas1p1524dea2d7089cb3492384bbe917dcffe@epcas1p1.samsung.com>
[not found] ` <20200520034307.20435-9-andrew-sh.cheng@mediatek.com>
2020-05-28 7:42 ` [PATCH 08/12] dt-bindings: devfreq: add compatible for mt8183 cci devfreq Chanwoo Choi
2020-06-15 7:31 ` [PATCH 00/12] Add cpufreq and cci devfreq for mt8183, and SVS support 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=6874cc1e-275f-9d17-045b-c717c307da9c@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=andrew-sh.cheng@mediatek.com \
--cc=broonie@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=myungjoo.ham@samsung.com \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=srv_heupstream@mediatek.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).