Re: [RESEND v3 2/2] dt-bindings: riscv: cpus: add ref to interrupt-controller

[Conor Dooley]

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@xxxxxxxxxxxxx>
> Signed-off-by: Kanak Shilledar <kanakshilledar111@xxxxxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxx
	Grabbing thread from lore.kernel.org/all/20240523154748.22670-2-kanakshilledar111@xxxxxxxxxxxxxx/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@xxxxxxxxxxxxx>
	  ✗ [PATCH v3 2/2] dt-bindings: riscv: cpus: add ref to interrupt-controller
	    + Signed-off-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
	  ---
	  ✗ 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: signature.asc
Description: PGP signature