* linux-next: manual merge of the mailbox tree with the arc-soc tree
@ 2025-07-22 1:14 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2025-07-22 1:14 UTC (permalink / raw)
To: Jassi Brar, Arnd Bergmann
Cc: ARM, Gary Yang, Guomin Chen, Justin Chen, Lihua Liu,
Linux Kernel Mailing List, Linux Next Mailing List, Peter Chen
[-- Attachment #1: Type: text/plain, Size: 2208 bytes --]
Hi all,
Today's linux-next merge of the mailbox tree got conflicts in:
drivers/mailbox/Kconfig
drivers/mailbox/Makefile
between commit:
fe2aa2361ddb ("mailbox: add CIX mailbox driver")
from the arc-soc tree and commit:
6aecd1f31f8e ("mailbox: Add support for bcm74110")
from the mailbox 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/mailbox/Kconfig
index 4fef4797b110,865da8986e53..000000000000
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@@ -340,14 -349,14 +349,24 @@@ config THEAD_TH1520_MBO
kernel is running, and E902 core used for power management among other
things.
+config CIX_MBOX
+ tristate "CIX Mailbox"
+ depends on ARCH_CIX || COMPILE_TEST
+ depends on OF
+ help
+ Mailbox implementation for CIX IPC system. The controller supports
+ 11 mailbox channels with different operating mode and every channel
+ is unidirectional. Say Y here if you want to use the CIX Mailbox
+ support.
+
+ config BCM74110_MAILBOX
+ tristate "Brcmstb BCM74110 Mailbox"
+ depends on ARCH_BRCMSTB || COMPILE_TEST
+ default ARCH_BRCMSTB
+ help
+ Broadcom STB mailbox driver present starting with brcmstb bcm74110
+ SoCs. The mailbox is a communication channel between the host
+ processor and coprocessor that handles various power management task
+ and more.
+
endif
diff --cc drivers/mailbox/Makefile
index 786a46587ba1,1c0627297474..000000000000
--- a/drivers/mailbox/Makefile
+++ b/drivers/mailbox/Makefile
@@@ -73,4 -75,4 +75,6 @@@ obj-$(CONFIG_QCOM_IPCC) += qcom-ipcc.
obj-$(CONFIG_THEAD_TH1520_MBOX) += mailbox-th1520.o
+obj-$(CONFIG_CIX_MBOX) += cix-mailbox.o
++
+ obj-$(CONFIG_BCM74110_MAILBOX) += bcm74110-mailbox.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-07-22 1:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-22 1:14 linux-next: manual merge of the mailbox tree with the arc-soc tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox