Hi all,

Today's linux-next merge of the mailbox tree got conflicts in:

  drivers/mailbox/Kconfig
  drivers/mailbox/Makefile

between commit:

  81db83e750ca ("mailbox: Add RISC-V SBI message proxy (MPXY) based mailbox driver")

from the risc-v tree and commit:

  52436007b862 ("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 aa2c868256d7,02432d4a5ccd..000000000000
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@@ -350,15 -359,14 +359,25 @@@ config CIX_MBO
            is unidirectional. Say Y here if you want to use the CIX Mailbox
            support.
  
 +config RISCV_SBI_MPXY_MBOX
 +	tristate "RISC-V SBI Message Proxy (MPXY) Mailbox"
 +	depends on RISCV_SBI
 +	default RISCV
 +	help
 +	  Mailbox driver implementation for RISC-V SBI Message Proxy (MPXY)
 +	  extension. This mailbox driver is used to send messages to the
 +	  remote processor through the SBI implementation (M-mode firmware
 +	  or HS-mode hypervisor). Say Y here if you want to have this support.
 +	  If unsure say N.
 +
+ 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 6659499a50db,98a68f838486..000000000000
--- a/drivers/mailbox/Makefile
+++ b/drivers/mailbox/Makefile
@@@ -75,4 -77,4 +77,6 @@@ obj-$(CONFIG_THEAD_TH1520_MBOX)	+= mail
  
  obj-$(CONFIG_CIX_MBOX)	+= cix-mailbox.o
  
 +obj-$(CONFIG_RISCV_SBI_MPXY_MBOX)	+= riscv-sbi-mpxy-mbox.o
++
+ obj-$(CONFIG_BCM74110_MAILBOX)	+= bcm74110-mailbox.o

On Thu, 07 Aug 2025 18:43:32 PDT (-0700), Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mailbox tree got conflicts in:
>
>   drivers/mailbox/Kconfig
>   drivers/mailbox/Makefile
>
> between commit:
>
>   81db83e750ca ("mailbox: Add RISC-V SBI message proxy (MPXY) based mailbox driver")
>
> from the risc-v tree and commit:
>
>   52436007b862 ("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.

Thanks, I think these are all pretty trivial so I was just going to 
point them out to Linus.  That said, I did pick up the RISC-V mailbox 
stuff super late so sorry about that -- Anup had asked me to pick it up 
a month ago, I just forgot.

>
> -- 
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/mailbox/Kconfig
> index aa2c868256d7,02432d4a5ccd..000000000000
> --- a/drivers/mailbox/Kconfig
> +++ b/drivers/mailbox/Kconfig
> @@@ -350,15 -359,14 +359,25 @@@ config CIX_MBO
>             is unidirectional. Say Y here if you want to use the CIX Mailbox
>             support.
>   
>  +config RISCV_SBI_MPXY_MBOX
>  +	tristate "RISC-V SBI Message Proxy (MPXY) Mailbox"
>  +	depends on RISCV_SBI
>  +	default RISCV
>  +	help
>  +	  Mailbox driver implementation for RISC-V SBI Message Proxy (MPXY)
>  +	  extension. This mailbox driver is used to send messages to the
>  +	  remote processor through the SBI implementation (M-mode firmware
>  +	  or HS-mode hypervisor). Say Y here if you want to have this support.
>  +	  If unsure say N.
>  +
> + 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 6659499a50db,98a68f838486..000000000000
> --- a/drivers/mailbox/Makefile
> +++ b/drivers/mailbox/Makefile
> @@@ -75,4 -77,4 +77,6 @@@ obj-$(CONFIG_THEAD_TH1520_MBOX)	+= mail
>   
>   obj-$(CONFIG_CIX_MBOX)	+= cix-mailbox.o
>   
>  +obj-$(CONFIG_RISCV_SBI_MPXY_MBOX)	+= riscv-sbi-mpxy-mbox.o
> ++
> + obj-$(CONFIG_BCM74110_MAILBOX)	+= bcm74110-mailbox.o