Hi all,
On Mon, 25 Sep 2023 11:10:07 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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:
pgpU86AQA_wn7.pgp
Description: OpenPGP digital signature
