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

[Stephen Rothwell]

Hi all,

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

  arch/arm/mach-omap1/Kconfig

between commit:

  67d3928c3df5 ("ARM: omap1: remove unused board files")

from the arm-soc tree and commit:

  609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation")

from the omap 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/mach-omap1/Kconfig
index 8df9a4de0e79,f833526aa7cd..000000000000
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@@ -118,8 -165,33 +118,8 @@@ config MACH_OMAP_OS
  	depends on ARCH_OMAP16XX
  	help
  	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
-           if you have such a board.
+ 	  if you have such a board.
  
 -config OMAP_OSK_MISTRAL
 -	bool "Mistral QVGA board Support"
 -	depends on MACH_OMAP_OSK
 -	depends on UNUSED_BOARD_FILES
 -	help
 -	  The OSK supports an optional add-on board with a Quarter-VGA
 -	  touchscreen, PDA-ish buttons, a resume button, bicolor LED,
 -	  and camera connector.  Say Y here if you have this board.
 -
 -config MACH_OMAP_PERSEUS2
 -	bool "TI Perseus2"
 -	depends on ARCH_OMAP730
 -	depends on UNUSED_BOARD_FILES
 -	help
 -	  Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
 -	  a board.
 -
 -config MACH_OMAP_FSAMPLE
 -	bool "TI F-Sample"
 -	depends on ARCH_OMAP730
 -	depends on UNUSED_BOARD_FILES
 -	help
 -	  Support for TI OMAP 850 F-Sample board. Say Y here if you have such
 -	  a board.
 -
  config MACH_OMAP_PALMTE
  	bool "Palm Tungsten E"
  	depends on ARCH_OMAP15XX
-------------- 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/20230110/841745fe/attachment.sig>