riscv: Idle thread using Zawrs extension

[bjoto]

Pull request for series with
subject: riscv: Idle thread using Zawrs extension
version: 1
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=845771

[bjoto]

Upstream branch: 6beb6bc
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=845771
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: riscv: process: Introduce idle thread using Zawrs extension
Using index info to reconstruct a base tree...
M	arch/riscv/kernel/process.c
Falling back to patching base and 3-way merge...
Auto-merging arch/riscv/kernel/process.c
CONFLICT (content): Merge conflict in arch/riscv/kernel/process.c
Patch failed at 0001 riscv: process: Introduce idle thread using Zawrs extension
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/kernel/process.c
index e4bc61c4e58a,9f0f7b888bc1..000000000000
--- a/arch/riscv/kernel/process.c
+++ b/arch/riscv/kernel/process.c
@@@ -35,7 -38,36 +36,40 @@@ EXPORT_SYMBOL(__stack_chk_guard)
  
  extern asmlinkage void ret_from_fork(void);
  
++<<<<<<< HEAD
 +void noinstr arch_cpu_idle(void)
++=======
+ static __cpuidle void default_idle(void)
+ {
+ 	/*
+ 	 * Add mb() here to ensure that all
+ 	 * IO/MEM accesses are completed prior
+ 	 * to entering WFI.
+ 	 */
+ 	mb();
+ 	wait_for_interrupt();
+ }
+ 
+ static __cpuidle void wrs_idle(void)
+ {
+ 	/*
+ 	 * Add mb() here to ensure that all
+ 	 * IO/MEM accesses are completed prior
+ 	 * to entering WRS.NTO.
+ 	 */
+ 	mb();
+ 	wrs_nto(&current_thread_info()->flags);
+ }
+ 
+ DEFINE_STATIC_CALL_NULL(riscv_idle, default_idle);
+ 
+ void __cpuidle cpu_do_idle(void)
+ {
+ 	static_call(riscv_idle)();
+ }
+ 
+ void __cpuidle arch_cpu_idle(void)
++>>>>>>> riscv: process: Introduce idle thread using Zawrs extension
  {
  	cpu_do_idle();
  }