From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v6 03/19] clk: Unconditionally recursively en-/dis-able clocks
Date: Thu, 12 Mar 2020 14:27:39 -0400 [thread overview]
Message-ID: <2d2040f0-219f-c45a-732e-8087b074f307@gmail.com> (raw)
In-Reply-To: <CAN5B=eJ9Q5DoaqGVOFQo+k0pDj2Nz37VbYsRnR8Na0sQ33eUWw@mail.gmail.com>
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
next prev parent reply other threads:[~2020-03-12 18:27 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 18:12 [PATCH v6 00/19] riscv: Add Sipeed Maix support Sean Anderson
2020-03-05 18:12 ` [PATCH v6 01/19] clk: Always use the supplied struct clk Sean Anderson
2020-03-05 18:12 ` [PATCH v6 02/19] clk: Check that ops of composite clock components exist before calling Sean Anderson
2020-03-05 18:12 ` [PATCH v6 03/19] clk: Unconditionally recursively en-/dis-able clocks Sean Anderson
2020-03-10 6:29 ` Rick Chen
2020-03-10 6:51 ` Rick Chen
2020-03-10 13:14 ` Sean Anderson
2020-03-11 2:09 ` Rick Chen
2020-03-12 18:27 ` Sean Anderson [this message]
2020-03-05 18:12 ` [PATCH v6 04/19] clk: Add functions to register CCF clock structs Sean Anderson
2020-03-10 7:08 ` Rick Chen
2020-03-17 19:00 ` Sean Anderson
2020-03-05 18:12 ` [PATCH v6 05/19] clk: Add K210 pll support Sean Anderson
2020-03-05 18:12 ` [PATCH v6 06/19] clk: Add a bypass clock for K210 Sean Anderson
2020-03-05 18:12 ` [PATCH v6 07/19] clk: Add K210 clock support Sean Anderson
2020-03-05 18:12 ` [PATCH v6 08/19] dm: Add support for simple-pm-bus Sean Anderson
2020-03-05 18:12 ` [PATCH v6 09/19] dm: Fix error handling for dev_read_addr_ptr Sean Anderson
2020-03-05 18:12 ` [PATCH v6 10/19] reset: Add generic reset driver Sean Anderson
2020-03-05 18:12 ` [PATCH v6 11/19] lib: Always set errno in hcreate_r Sean Anderson
2020-03-05 18:13 ` [PATCH v6 12/19] riscv: Add headers for asm/global_data.h Sean Anderson
2020-03-05 18:13 ` [PATCH v6 13/19] riscv: Fix race conditions when initializing IPI Sean Anderson
2020-03-10 8:20 ` Rick Chen
2020-03-10 13:16 ` Sean Anderson
2020-03-11 1:33 ` Rick Chen
2020-03-17 19:27 ` Sean Anderson
2020-03-05 18:13 ` [PATCH v6 14/19] riscv: Add option to support RISC-V privileged spec 1.9 Sean Anderson
2020-03-05 18:13 ` [PATCH v6 15/19] riscv: Allow use of reset drivers Sean Anderson
2020-03-05 18:13 ` [PATCH v6 16/19] riscv: Try to get cpu frequency from a "clocks" node if it exists Sean Anderson
2020-03-05 18:13 ` [PATCH v6 17/19] riscv: Enable cpu clock if it is present Sean Anderson
2020-03-05 18:13 ` [PATCH v6 18/19] riscv: Add device tree for K210 and Sipeed Maix BitM Sean Anderson
2020-03-10 9:08 ` Rick Chen
2020-03-10 13:17 ` Sean Anderson
2020-03-11 1:51 ` Rick Chen
2020-03-05 18:13 ` [PATCH v6 19/19] riscv: Add Sipeed Maix support Sean Anderson
2020-03-10 9:04 ` Rick Chen
2020-03-10 13:19 ` Sean Anderson
2020-03-11 2:05 ` Rick Chen
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=2d2040f0-219f-c45a-732e-8087b074f307@gmail.com \
--to=seanga2@gmail.com \
--cc=u-boot@lists.denx.de \
/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