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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230725093110.285eb858@canb.auug.org.au>
Date:   Tue, 25 Jul 2023 09:31:10 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Hector Martin <marcan@...can.st>, Olof Johansson <olof@...om.net>,
        Arnd Bergmann <arnd@...db.de>
Cc:     ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Ulf Hansson <ulf.hansson@...aro.org>
Subject: linux-next: manual merge of the asahi-soc tree with the arm-soc
 tree

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
  

Content of type "application/pgp-signature" skipped