From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Hector Martin <marcan@marcan•st>
Cc: Ulf Hansson <ulf.hansson@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the pmdomain tree with the asahi-soc tree
Date: Fri, 3 Nov 2023 09:38:46 +1100 [thread overview]
Message-ID: <20231103093846.489e12db@canb.auug.org.au> (raw)
In-Reply-To: <20230925111007.46e31ba2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2352 bytes --]
Hi all,
On Mon, 25 Sep 2023 11:10:07 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the pmdomain tree got a conflict in:
>
> drivers/soc/apple/Kconfig
>
> between commit:
>
> 6fca0adc61cf ("soc: apple: mailbox: Add ASC/M3 mailbox driver")
>
> from the asahi-soc tree and commit:
>
> 1bfadf2edd65 ("pmdomain: apple: Move Kconfig option to the pmdomain subsystem")
>
> from the pmdomain 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 --cc drivers/soc/apple/Kconfig
> index c5203c388bf4,eff486a77337..000000000000
> --- a/drivers/soc/apple/Kconfig
> +++ b/drivers/soc/apple/Kconfig
> @@@ -4,35 -4,9 +4,22 @@@ if ARCH_APPLE || COMPILE_TES
>
> menu "Apple SoC drivers"
>
> - config APPLE_PMGR_PWRSTATE
> - bool "Apple SoC PMGR power state control"
> - depends on PM
> - select REGMAP
> - select MFD_SYSCON
> - select PM_GENERIC_DOMAINS
> - select RESET_CONTROLLER
> - default ARCH_APPLE
> - help
> - The PMGR block in Apple SoCs provides high-level power state
> - controls for SoC devices. This driver manages them through the
> - generic power domain framework, and also provides reset support.
> -
> +config APPLE_MAILBOX
> + tristate "Apple SoC mailboxes"
> + depends on PM
> + depends on ARCH_APPLE || (64BIT && COMPILE_TEST)
> + default ARCH_APPLE
> + help
> + Apple SoCs have various co-processors required for certain
> + peripherals to work (NVMe, display controller, etc.). This
> + driver adds support for the mailbox controller used to
> + communicate with those.
> +
> + Say Y here if you have an Apple SoC.
> +
> config APPLE_RTKIT
> tristate "Apple RTKit co-processor IPC protocol"
> - depends on MAILBOX
> + depends on APPLE_MAILBOX
> depends on ARCH_APPLE || COMPILE_TEST
> default ARCH_APPLE
> help
This is now a conflict between the asahi-soc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2023-11-02 22:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 1:10 linux-next: manual merge of the pmdomain tree with the asahi-soc tree Stephen Rothwell
2023-11-02 22:38 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231103093846.489e12db@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marcan@marcan$(echo .)st \
--cc=ulf.hansson@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox