mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jassi Brar <jassisinghbrar@gmail.com>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	Paul Walmsley <paul@pwsan.com>
Cc: Anup Patel <apatel@ventanamicro.com>,
	Justin Chen <justin.chen@broadcom.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Rahul Pathak <rpathak@ventanamicro.com>
Subject: linux-next: manual merge of the mailbox tree with the risc-v tree
Date: Fri, 8 Aug 2025 11:43:32 +1000	[thread overview]
Message-ID: <20250808114332.63ec1528@canb.auug.org.au> (raw)

[-- 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 --]

             reply	other threads:[~2025-08-08  1:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-08  1:43 Stephen Rothwell [this message]
2025-08-08 17:20 ` Palmer Dabbelt

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=20250808114332.63ec1528@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=apatel@ventanamicro.com \
    --cc=jassisinghbrar@gmail.com \
    --cc=justin.chen@broadcom.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=palmer@dabbelt.com \
    --cc=paul@pwsan.com \
    --cc=rpathak@ventanamicro.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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

all inboxes | Powered by JetHome®