Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 10 Jan 2023 09:50:41 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Tony Lindgren <tony@atomide.com>, Olof Johansson <olof@lixom.net>,
        Arnd Bergmann <arnd@arndb.de>
Cc:     ARM <linux-arm-kernel@lists.infradead.org>,
        Juerg Haefliger <juerg.haefliger@canonical.com>,
        Juerg Haefliger <juergh@canonical.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the omap tree with the arm-soc tree
Message-ID: <20230110095041.0d6311d2@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/MerinwpLbe/lTj.Zhja5xiA";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/MerinwpLbe/lTj.Zhja5xiA
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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.
 =20
 -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

--Sig_/MerinwpLbe/lTj.Zhja5xiA
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmO8mkEACgkQAVBC80lX
0GycWAf7BkBy8+/53CoBELak+XV7Ky6Gj8MuopsD8I2mTVdErMTuJR1AfIPmpUil
hdBvRgJWJDjBHr8Uk0g2+ihEr8L6c1nGere0kgYxhLKJPsw9BsiSErQVU7lpdhH5
nM88P4trYsiGInoaAd+AevcQetsk3cVdHB+KxL24r8oFddCuVvfJgFSbcB9pVcQl
EHe3+dDL58rRnEgpbHTL0qspwiHo+D2tgcLqE1zbvrP4oKkIhsnc1gmVPEgUm8p8
Xnv+nraGDQEbuZJkbvPg/xa7T1jIOnqcerXS+Mv4Kyt04ka4EHbDMnbttZUqqfKh
9ciKFQEszdgG5Zs+jX+4mnPGz1LAXA==
=1UF9
-----END PGP SIGNATURE-----

--Sig_/MerinwpLbe/lTj.Zhja5xiA--