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@xxxxxxxxxxxxxxxxxxxx> >>> 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
