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

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.

index 2f0cc26c652f6..72628180aa3a5 100644
@@ -336,6 +336,8 @@ ACPI FOR ARM64 (ACPI/arm64)
  M:	Lorenzo Pieralisi <[email protected]>
  M:	Hanjun Guo <[email protected]>
- M:	Sudeep Holla <[email protected]>
+ M:	Sudeep Holla <[email protected]>
 +M:	Catalin Marinas <[email protected]>
 +M:	Will Deacon <[email protected]>
  L:	[email protected]

L: [email protected] (moderated for non-subscribers)
S: Maintained