From: Sean Anderson Date: Thu, 12 Mar 2020 14:27:39 -0400 Subject: [PATCH v6 03/19] clk: Unconditionally recursively en-/dis-able clocks In-Reply-To: References: <20200305181308.944595-1-seanga2@gmail.com> <20200305181308.944595-4-seanga2@gmail.com> Message-ID: <2d2040f0-219f-c45a-732e-8087b074f307@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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