riscv: add initial support for Canaan Kendryte K230

[bjoto]

Pull request for series with
subject: riscv: add initial support for Canaan Kendryte K230
version: 1
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=831868

[bjoto]

Upstream branch: a11dd49
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=831868
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: dt-bindings: riscv: Add T-HEAD C908 compatible
Applying: dt-bindings: add Canaan K230 boards compatible strings
Applying: riscv: Kconfig.socs: Allow SOC_CANAAN with MMU for K230
Using index info to reconstruct a base tree...
M	arch/riscv/Kconfig.socs
Falling back to patching base and 3-way merge...
Auto-merging arch/riscv/Kconfig.socs
Applying: riscv: dts: add initial canmv-k230 and k230-evb dts
Using index info to reconstruct a base tree...
M	arch/riscv/boot/dts/canaan/Makefile
Falling back to patching base and 3-way merge...
Auto-merging arch/riscv/boot/dts/canaan/Makefile
CONFLICT (content): Merge conflict in arch/riscv/boot/dts/canaan/Makefile
Patch failed at 0004 riscv: dts: add initial canmv-k230 and k230-evb dts
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 arch/riscv/boot/dts/canaan/Makefile
index 520623264c87,b4a0ec668f9a..000000000000
--- a/arch/riscv/boot/dts/canaan/Makefile
+++ b/arch/riscv/boot/dts/canaan/Makefile
@@@ -5,5 -5,5 +5,10 @@@ dtb-$(CONFIG_ARCH_CANAAN) += sipeed_mai
  dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maix_dock.dtb
  dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maix_go.dtb
  dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maixduino.dtb
++<<<<<<< HEAD
 +
 +obj-$(CONFIG_ARCH_CANAAN_K210_DTB_BUILTIN) += $(addsuffix .dtb.o, $(CONFIG_ARCH_CANAAN_K210_DTB_SOURCE))
++=======
+ dtb-$(CONFIG_ARCH_CANAAN) += k230-evb.dtb
 -dtb-$(CONFIG_ARCH_CANAAN) += canmv-k230.dtb
++dtb-$(CONFIG_ARCH_CANAAN) += canmv-k230.dtb
++>>>>>>> riscv: dts: add initial canmv-k230 and k230-evb dts