Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Milk-V Duo board support #89

Closed
wants to merge 1 commit into from
Closed

Conversation

bjoto
Copy link

@bjoto bjoto commented Sep 30, 2023

Pull request for series with
subject: Add Milk-V Duo board support
version: 1
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=789015

@bjoto
Copy link
Author

bjoto commented Sep 30, 2023

Upstream branch: 9f564b9
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=789015
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=789015
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: dt-bindings: interrupt-controller: Add SOPHGO CV1800B plic
Using index info to reconstruct a base tree...
M	Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
Falling back to patching base and 3-way merge...
Auto-merging Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
Patch failed at 0001 dt-bindings: interrupt-controller: Add SOPHGO CV1800B plic
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".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
index dc1f28e55266,5c4539881a22..000000000000
--- a/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
@@@ -65,6 -65,8 +65,11 @@@ properties
        - items:
            - enum:
                - allwinner,sun20i-d1-plic
++<<<<<<< HEAD
++=======
+               - sophgo,cv1800-plic
+               - sophgo,sg2042-plic
++>>>>>>> dt-bindings: interrupt-controller: Add SOPHGO CV1800B plic
                - thead,th1520-plic
            - const: thead,c900-plic
        - items:

@bjoto
Copy link
Author

bjoto commented Oct 2, 2023

At least one diff in series https://patchwork.kernel.org/project/linux-riscv/list/?series=789015 expired. Closing PR.

@bjoto bjoto closed this Oct 2, 2023
@bjoto bjoto deleted the series/789015=>fixes branch October 4, 2023 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant