On 3/10/20 10:09 PM, Rick Chen wrote:
Hi Sean
On 3/10/20 2:51 AM, Rick Chen wrote:
Hi Sean I have told you in v5, that this patch have conflict with u-boot/master please rebase it. But it still conflict in v6.
https://patchwork.ozlabs.org/patch/1246836/
Applying: clk: Always use the supplied struct clk Applying: clk: Check that ops of composite clock components exist before calling Applying: clk: Unconditionally recursively en-/dis-able clocks error: patch failed: drivers/clk/clk-uclass.c:522 error: drivers/clk/clk-uclass.c: patch does not apply Patch failed at 0003 clk: Unconditionally recursively en-/dis-able clocks The copy of the patch that failed is found in: .git/rebase-apply/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".
This was just rebased against u-boot/master. Should I be rebasing against a different branch? The commit I am working off is
It is just fine to sync with u-boot/master. Before I send a PR, I shall sync to u-boot/master too.
Thanks, Rick
I think I found the issue. I made a commit to add some more log messages to that file, and it seems to have changed the line numbers. Next patch I will rebase without that commit.
--Sean