linux-next: manual merge of the risc-v tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/mailbox/Kconfig
  drivers/mailbox/Makefile

between commit:

  fe2aa2361ddb ("mailbox: add CIX mailbox driver")

from Linus' tree and commit:

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

from the risc-v 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,eb5e0384fec6..000000000000
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@@ -340,14 -340,15 +340,25 @@@ 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 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.
+ 
  endif
diff --cc drivers/mailbox/Makefile
index 786a46587ba1,46689c1277f8..000000000000
--- a/drivers/mailbox/Makefile
+++ b/drivers/mailbox/Makefile
@@@ -73,4 -73,4 +73,6 @@@ obj-$(CONFIG_QCOM_IPCC)		+= qcom-ipcc.
  
  obj-$(CONFIG_THEAD_TH1520_MBOX)	+= mailbox-th1520.o
  
 +obj-$(CONFIG_CIX_MBOX)	+= cix-mailbox.o
++
+ obj-$(CONFIG_RISCV_SBI_MPXY_MBOX)	+= riscv-sbi-mpxy-mbox.o

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