Hi all,

Today's linux-next merge of the rcu tree got a conflict in:

  arch/loongarch/Kconfig

between commit:

  c78c43fe7d42 ("LoongArch: Use acpi_arch_dma_setup() and remove ARCH_HAS_PHYS_TO_DMA")

from Linus' tree and commit:

  839fc1e464eb ("arch/loongarch: Add ARCH_HAS_NMI_SAFE_THIS_CPU_OPS Kconfig option")

from the rcu tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/loongarch/Kconfig
index 903096bd87f8,c8864768dc4d..000000000000
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@@ -10,6 -10,8 +10,7 @@@ config LOONGARC
  	select ARCH_ENABLE_MEMORY_HOTPLUG
  	select ARCH_ENABLE_MEMORY_HOTREMOVE
  	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI
+ 	select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS
 -	select ARCH_HAS_PHYS_TO_DMA
  	select ARCH_HAS_PTE_SPECIAL
  	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
  	select ARCH_INLINE_READ_LOCK if !PREEMPTION