linux-next: manual merge of the drivers-x86 tree with the arm64 tree

[Stephen Rothwell]

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.

-- 
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
  
 +ARM64 FIT SUPPORT
 +M:	Simon Glass <sjg@xxxxxxxxxxxx>
 +L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
 +S:	Maintained
 +F:	arch/arm64/boot/Makefile
 +F:	scripts/make_fit.py
 +
+ ARM64 PLATFORM DRIVERS
+ M:	Hans de Goede <hdegoede@xxxxxxxxxx>
+ M:	Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
+ R:	Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
+ L:	platform-driver-x86@xxxxxxxxxxxxxxx
+ 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-drivers-x86.git
+ F:	drivers/platform/arm64/
+ 
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:	Catalin Marinas <catalin.marinas@xxxxxxx>
  M:	Will Deacon <will@xxxxxxxxxx>

Attachment: pgpkqMtbn6mhs.pgp
Description: OpenPGP digital signature