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

riscv: sophgo: add clock support for Sophgo CV1800/SG2000 SoCs #476

Closed
wants to merge 1 commit into from

Conversation

bjoto
Copy link

@bjoto bjoto commented Jan 14, 2024

Pull request for series with
subject: riscv: sophgo: add clock support for Sophgo CV1800/SG2000 SoCs
version: 6
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=816716

@bjoto
Copy link
Author

bjoto commented Jan 14, 2024

Upstream branch: b8b2711
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=816716
version: 6

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: dt-bindings: clock: sophgo: Add clock controller of SG2000 series SoC
Using index info to reconstruct a base tree...
A	Documentation/devicetree/bindings/clock/sophgo,cv1800-clk.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): Documentation/devicetree/bindings/clock/sophgo,cv1800-clk.yaml deleted in HEAD and modified in dt-bindings: clock: sophgo: Add clock controller of SG2000 series SoC. Version dt-bindings: clock: sophgo: Add clock controller of SG2000 series SoC of Documentation/devicetree/bindings/clock/sophgo,cv1800-clk.yaml left in tree.
Patch failed at 0001 dt-bindings: clock: sophgo: Add clock controller of SG2000 series SoC
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:

* Unmerged path Documentation/devicetree/bindings/clock/sophgo,cv1800-clk.yaml

@bjoto
Copy link
Author

bjoto commented Jan 17, 2024

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

@bjoto bjoto closed this Jan 17, 2024
@bjoto bjoto deleted the series/816716=>fixes branch January 17, 2024 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant