riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT

[bjoto]

Pull request for series with
subject: riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT
version: 1
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=793388

[bjoto]

Upstream branch: 3fec323
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=793388
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT
Using index info to reconstruct a base tree...
M	drivers/soc/renesas/Kconfig
Falling back to patching base and 3-way merge...
Auto-merging drivers/soc/renesas/Kconfig
Applying: riscv: only select DMA_DIRECT_REMAP from RISCV_ISA_ZICBOM
Applying: soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM
Using index info to reconstruct a base tree...
M	drivers/soc/renesas/Kconfig
Falling back to patching base and 3-way merge...
Auto-merging drivers/soc/renesas/Kconfig
CONFLICT (content): Merge conflict in drivers/soc/renesas/Kconfig
Patch failed at 0003 soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM
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 drivers/soc/renesas/Kconfig
index 313bda3345c9,f1696d3b5018..000000000000
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@@ -333,6 -333,8 +333,11 @@@ if RISC
  
  config ARCH_R9A07G043
  	bool "RISC-V Platform support for RZ/Five"
++<<<<<<< HEAD
++=======
+ 	depends on NONPORTABLE
+ 	depends on !RISCV_ISA_ZICBOM
++>>>>>>> soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM
  	select ARCH_RZG2L
  	select AX45MP_L2_CACHE
  	select DMA_GLOBAL_POOL

[bjoto]

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