From: Conor Dooley <conor@kernel.org>
To: Kanak Shilledar <kanakshilledar@gmail.com>
Cc: Kanak Shilledar <kanakshilledar111@protonmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Samuel Holland <samuel.holland@sifive.com>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-riscv@lists.infradead.org,
Conor Dooley <conor.dooley@microchip.com>
Subject: Re: [RESEND v3 2/2] dt-bindings: riscv: cpus: add ref to interrupt-controller
Date: Fri, 7 Jun 2024 15:11:12 +0100 [thread overview]
Message-ID: <20240607-essay-rink-a74d82d3c56a@spud> (raw)
In-Reply-To: <20240523154748.22670-3-kanakshilledar111@protonmail.com>
[-- Attachment #1: Type: text/plain, Size: 3524 bytes --]
On Thu, May 23, 2024 at 09:17:50PM +0530, Kanak Shilledar wrote:
> removed the redundant properties for interrupt-controller
> and provide reference to the riscv,cpu-intc.yaml which defines
> the interrupt-controller. making the properties for riscv
> interrupt-controller at a central place.
>
> Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
> Signed-off-by: Kanak Shilledar <kanakshilledar111@protonmail.com>
> ---
> Changes in v3:
> - No change.
> - Rolling out as RESEND.
> Changes in v2:
> - Fix warning of `type` is a required property during `make
> dt_bindings_check`.
> ---
> .../interrupt-controller/riscv,cpu-intc.yaml | 2 +-
> .../devicetree/bindings/riscv/cpus.yaml | 21 +------------------
> 2 files changed, 2 insertions(+), 21 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml b/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
> index c9c79e0870ff..6c229f3c6735 100644
> --- a/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
> +++ b/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
> @@ -61,7 +61,7 @@ required:
> - compatible
> - '#interrupt-cells'
> - interrupt-controller
> -
> +
I tried to get Palmer to apply this the other day, but the series
somehow conflicts with itself, due to this hunk. When I apply patch 1/2
locally, this whitespace never appears in the file and so patch 2/2 has
a conflict:
b4 shazam 20240523154748.22670-2-kanakshilledar111@protonmail.com
Grabbing thread from lore.kernel.org/all/20240523154748.22670-2-kanakshilledar111@protonmail.com/t.mbox.gz
Checking for newer revisions
Grabbing search results from lore.kernel.org
Analyzing 3 messages in the thread
Looking for additional code-review trailers on lore.kernel.org
Checking attestation on all messages, may take a moment...
---
✗ [PATCH v3 1/2] dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema
+ Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
✗ [PATCH v3 2/2] dt-bindings: riscv: cpus: add ref to interrupt-controller
+ Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
✗ BADSIG: DKIM/gmail.com
---
Total patches: 2
---
Base: using specified base-commit 20cb38a7af88dc40095da7c2c9094da3873fea23
Applying: dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema
Applying: dt-bindings: riscv: cpus: add ref to interrupt-controller
Patch failed at 0002 dt-bindings: riscv: cpus: add ref to interrupt-controller
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".
error: patch failed: Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml:61
error: Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
He also pointed out that there's a from address mismatch in this patch,
given it was sent from gmail but the signoff is proton. Usually git
send-email will sort this out, provided you've set the protonmail
address as the author for the patch. I think usually this sort of issue
comes about when your signoff email isn't the same as user.email in your
gitconfig, but 100% on that.
Thanks,
Conor.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
prev parent reply other threads:[~2024-06-07 14:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-23 15:47 [RESEND v3 0/2] dt-bindings: interrupt-controller: riscv,cpu-intc Kanak Shilledar
2024-05-23 15:47 ` [RESEND v3 1/2] dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema Kanak Shilledar
2024-05-23 15:47 ` [RESEND v3 2/2] dt-bindings: riscv: cpus: add ref to interrupt-controller Kanak Shilledar
2024-06-07 14:11 ` Conor Dooley [this message]
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=20240607-essay-rink-a74d82d3c56a@spud \
--to=conor@kernel.org \
--cc=aou@eecs.berkeley.edu \
--cc=conor+dt@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=kanakshilledar111@protonmail.com \
--cc=kanakshilledar@gmail.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=robh@kernel.org \
--cc=samuel.holland@sifive.com \
--cc=tglx@linutronix.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