Subject: linux-next: manual merge of the asahi-soc tree with the arm-soc tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 25 Jul 2023 09:31:10 +1000

Hi all,

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

  drivers/soc/apple/Makefile

between commit:

  869b9dd3339a ("soc: apple: Move power-domain driver to the genpd dir")

from the arm-soc tree and commits:

  6fca0adc61cf ("soc: apple: mailbox: Add ASC/M3 mailbox driver")
  eaf935fa48ec ("soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX")

from the asahi-soc 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 drivers/soc/apple/Makefile
index b241e6a65e5b,20feee6f3943..000000000000
--- a/drivers/soc/apple/Makefile
+++ b/drivers/soc/apple/Makefile
@@@ -1,4 -1,9 +1,7 @@@
  # SPDX-License-Identifier: GPL-2.0-only
 -obj-$(CONFIG_APPLE_PMGR_PWRSTATE)	+= apple-pmgr-pwrstate.o
 -
+ obj-$(CONFIG_APPLE_MAILBOX) += apple-mailbox.o
+ apple-mailbox-y = mailbox.o
+ 
  obj-$(CONFIG_APPLE_RTKIT) += apple-rtkit.o
  apple-rtkit-y = rtkit.o rtkit-crashlog.o