Received-SPF: pass (google.com: domain of linux-kernel+bounces-144504-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 15 Apr 2024 13:10:53 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Hans de Goede <hdegoede@redhat.com>, Mark Gross <markgross@kernel.org>,
 Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Nikita Travkin <nikita@trvn.ru>,
 Simon Glass <sjg@chromium.org>
Subject: linux-next: manual merge of the drivers-x86 tree with the arm64
 tree
Message-ID: <20240415131053.10724106@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/B3+yDKgiGJ4JZrgKQwZBM67";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/B3+yDKgiGJ4JZrgKQwZBM67
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  MAINTAINERS

between commit:

  7a23b027ec17 ("arm64: boot: Support Flat Image Tree")

from the arm64 tree and commit:

  363c8aea2572 ("platform: Add ARM64 platform directory")

from the drivers-x86 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 MAINTAINERS
index c62233533f1f,3fb0fa67576d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3091,13 -3063,16 +3103,23 @@@ F:	drivers/mmc/host/sdhci-of-arasan.
  N:	zynq
  N:	xilinx
 =20
 +ARM64 FIT SUPPORT
 +M:	Simon Glass <sjg@chromium.org>
 +L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:	Maintained
 +F:	arch/arm64/boot/Makefile
 +F:	scripts/make_fit.py
 +
+ ARM64 PLATFORM DRIVERS
+ M:	Hans de Goede <hdegoede@redhat.com>
+ M:	Ilpo J=C3=A4rvinen <ilpo.jarvinen@linux.intel.com>
+ R:	Bryan O'Donoghue <bryan.odonoghue@linaro.org>
+ L:	platform-driver-x86@vger.kernel.org
+ S:	Maintained
+ Q:	https://patchwork.kernel.org/project/platform-driver-x86/list/
+ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drive=
rs-x86.git
+ F:	drivers/platform/arm64/
+=20
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:	Catalin Marinas <catalin.marinas@arm.com>
  M:	Will Deacon <will@kernel.org>

--Sig_/B3+yDKgiGJ4JZrgKQwZBM67
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYcmr0ACgkQAVBC80lX
0GzAlgf8Cfg6Uqrf2Z+DdeyBq0Akv2mBMmwNKsx3FHAUEtiZcH2EzWx3vRRlfVMh
NlNgQXbPhoyyvFPqKorO/kxGla/PhHQ8lHWd1J0L00zXzzKhKuLz3Uck5NZKXew5
t0AdRB/rz9R1XMQgMTG305QzdutRd9LHAcmO0pWhNQaSskmgzaFlVn5E5SR+ugCx
WsSFWFjw7jj4jx6JykeLlqPzx5mR0m+drjQUNyM6yhhyQmNeupuA18aHWVYyMd4D
jLrREeypcvjdLL9KSZr73JfsR7DMUyAU7Glnza5XszM0a5ySee9AVTdCgELJ18TW
Ahw2UWXJUDY5mAUVypRKpz39pdPaiQ==
=HXo0
-----END PGP SIGNATURE-----

--Sig_/B3+yDKgiGJ4JZrgKQwZBM67--