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:42:46 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Bartosz Golaszewski <brgl@bgdev.pl>,
        Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc:     ARM <linux-arm-kernel@lists.infradead.org>,
        Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
        Jilin Yuan <yuanjilin@cdjrlc.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 davinci tree with the arm-soc tree
Message-ID: <20230110094246.1497d12e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/UX9MyVrSXCmEHSFeNun/8Nf";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/UX9MyVrSXCmEHSFeNun/8Nf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/arm/mach-davinci/board-dm365-evm.c

between commit:

  fef6ca600ba7 ("ARM: davinci: remove unused board support")

from the arm-soc tree and commit:

  84bde55c050b ("ARM: davinci: fix repeated words in comments")

from the davinci tree.

I fixed it up (I removed the file) 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

--Sig_/UX9MyVrSXCmEHSFeNun/8Nf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmO8mGYACgkQAVBC80lX
0GyBzwf+MrEGJvgsywvPzzoCE37N7+H9UpELbyC59ORp+P+lx+bgM2XX/f8RMlDl
S12t59Sl2OaA4zpvj7EmiMy/o9M7bcV8DxdgOwWJmqis0nbxNlkqICgs6xays8Go
/0GZW68ZcG4J7GZo5GSdVdakiF8lTgbzi0va6gVn/dv7cU1TOu+NZO/SS7xJleaG
IyFxC0h0ubN2xutH0JkOvxiEjUAVMFlBxm3NTEilphlG6MxsuJsIKjNfVEiPusyA
AlmX48QgOVQq7XyPmN4aUXS0WqV+Or5LLHb90fUJe6NHmrQhqqrxI4MeEKytAmuW
BuKToJEQHzMwZbmgDI2d81paR4zFZw==
=sCXs
-----END PGP SIGNATURE-----

--Sig_/UX9MyVrSXCmEHSFeNun/8Nf--