Subject: linux-next: manual merge of the reset tree with the arm-soc tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 25 Jan 2021 08:28:37 +1100

Hi all,

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

  drivers/reset/Kconfig

between commit:

  89d4f98ae90d ("ARM: remove zte zx platform")

from the arm-soc tree and commit:

  def26913b66f ("reset: simple: add BCM4908 MISC PCIe reset controller support")

from the reset 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 drivers/reset/Kconfig
index 8dd99ca2192c,752bef7e564f..000000000000
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@@ -173,7 -173,7 +173,7 @@@ config RESET_SCM
  
  config RESET_SIMPLE
  	bool "Simple Reset Controller Driver" if COMPILE_TEST
- 	default ARCH_AGILEX || ARCH_ASPEED || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARC
 -	default ARCH_AGILEX || ARCH_ASPEED || ARCH_BCM4908 || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARCH_ZX || ARC
++	default ARCH_AGILEX || ARCH_ASPEED || ARCH_BCM4908 || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARC
  	help
  	  This enables a simple reset controller driver for reset lines that
  	  that can be asserted and deasserted by toggling bits in a contiguous,