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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

Hi all,

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

  MAINTAINERS

between commit:

  59e82a4237cf3 ("MAINTAINERS: Change Sudeep Holla's email address")

from the arm-soc-fixes tree and commit:

  e97e3e31d8988 ("MAINTAINERS: Update the maintainers for ARM64 ACPI")

from the arm64 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.

diff --git a/MAINTAINERS b/MAINTAINERS
index 2f0cc26c652f6..72628180aa3a5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -336,6 +336,8 @@ ACPI FOR ARM64 (ACPI/arm64)
  M:	Lorenzo Pieralisi <lpieralisi@kernel.org>
  M:	Hanjun Guo <guohanjun@huawei.com>
- M:	Sudeep Holla <sudeep.holla@arm.com>
+ M:	Sudeep Holla <sudeep.holla@kernel.org>
 +M:	Catalin Marinas <catalin.marinas@arm.com>
 +M:	Will Deacon <will@kernel.org>
  L:	linux-acpi@vger.kernel.org
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]