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

[Stephen Rothwell]

Hi all,

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

  arch/arm/Kconfig.debug

between commits:

  9ca4efec0aba ("ARM: 9040/1: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART")
  6e959ad8bb90 ("ARM: 9041/1: sti LL_UART: add STiH418 SBC UART0 support")

from the arm tree and commits:

  f3a732843acc ("ARM: remove sirf prima2/atlas platforms")
  89d4f98ae90d ("ARM: remove zte zx platform")

from the arm-soc 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/arm/Kconfig.debug
index 7a8697a97c98,c36c5d4c6e9c..000000000000
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1623,10 -1546,7 +1550,9 @@@ config DEBUG_LL_INCLUD
  	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
  	default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART
  	default "debug/s5pv210.S" if DEBUG_S5PV210_UART
- 	default "debug/sirf.S" if DEBUG_SIRFSOC_UART
 -	default "debug/sti.S" if DEBUG_STI_UART
 +	default "debug/sti.S" if DEBUG_STIH41X_ASC2
 +	default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
 +	default "debug/sti.S" if DEBUG_STIH418_SBC_ASC0
  	default "debug/stm32.S" if DEBUG_STM32_UART
  	default "debug/tegra.S" if DEBUG_TEGRA_UART
  	default "debug/ux500.S" if DEBUG_UX500_UART
@@@ -1659,8 -1579,6 +1585,7 @@@ config DEBUG_UART_PHY
  	default 0x02531000 if DEBUG_KEYSTONE_UART1
  	default 0x03010fe0 if ARCH_RPC
  	default 0x07000000 if DEBUG_SUN9I_UART0
- 	default 0x09405000 if DEBUG_ZTE_ZX
 +	default 0x09530000 if DEBUG_STIH418_SBC_ASC0
  	default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
  				DEBUG_VEXPRESS_UART0_CA9
  	default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
@@@ -1789,10 -1698,8 +1707,10 @@@
  		DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
  		DEBUG_S3C64XX_UART || \
  		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
- 		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
+ 		DEBUG_DIGICOLOR_UA0 || \
 -		DEBUG_AT91_UART || DEBUG_STM32_UART
 +		DEBUG_AT91_UART || DEBUG_STM32_UART || \
 +		DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
 +		DEBUG_STIH418_SBC_ASC0
  
  config DEBUG_UART_VIRT
  	hex "Virtual base address of debug UART"
@@@ -1854,12 -1760,9 +1772,11 @@@
  	default 0xfb020000 if DEBUG_OMAP3UART3
  	default 0xfb042000 if DEBUG_OMAP3UART4
  	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
- 	default 0xfc705000 if DEBUG_ZTE_ZX
  	default 0xfcfe8600 if DEBUG_BCM63XX_UART
  	default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
 +	default 0xfd531000 if DEBUG_STIH41X_SBC_ASC1
  	default 0xfd883000 if DEBUG_ALPINE_UART0
 +	default 0xfdd32000 if DEBUG_STIH41X_ASC2
  	default 0xfe010000 if STM32MP1_DEBUG_UART
  	default 0xfe017000 if DEBUG_MMP_UART2
  	default 0xfe018000 if DEBUG_MMP_UART3
@@@ -1904,10 -1802,8 +1816,10 @@@
  		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
  		DEBUG_S3C64XX_UART || \
  		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
- 		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
+ 		DEBUG_DIGICOLOR_UA0 || \
 -		DEBUG_AT91_UART || DEBUG_STM32_UART
 +		DEBUG_AT91_UART || DEBUG_STM32_UART || \
 +		DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
 +		DEBUG_STIH418_SBC_ASC0
  
  config DEBUG_UART_8250_SHIFT
  	int "Register offset shift for the 8250 debug UART"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20210202/a38e87d7/attachment.sig>