mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* linux-next: manual merge of the mailbox tree with the risc-v tree
@ 2025-08-08  1:43 Stephen Rothwell
  2025-08-08 17:20 ` Palmer Dabbelt
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-08-08  1:43 UTC (permalink / raw)
  To: Jassi Brar, Palmer Dabbelt, Paul Walmsley
  Cc: Anup Patel, Justin Chen, Linux Kernel Mailing List,
	Linux Next Mailing List, Rahul Pathak

[-- Attachment #1: Type: text/plain, Size: 2294 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the mailbox tree with the risc-v tree
  2025-08-08  1:43 linux-next: manual merge of the mailbox tree with the risc-v tree Stephen Rothwell
@ 2025-08-08 17:20 ` Palmer Dabbelt
  0 siblings, 0 replies; 2+ messages in thread
From: Palmer Dabbelt @ 2025-08-08 17:20 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: jassisinghbrar, Paul Walmsley, apatel, justin.chen, linux-kernel,
	linux-next, rpathak

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-08-08 17:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-08-08  1:43 linux-next: manual merge of the mailbox tree with the risc-v tree Stephen Rothwell
2025-08-08 17:20 ` Palmer Dabbelt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®