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

[Stephen Rothwell]

Hi all,

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

  arch/riscv/configs/defconfig

between commit:

  1776fca7fadb ("riscv: configs: defconfig: Enable Renesas RZ/Five SoC")

from Linus' tree and commit:

  497bcbe3ce04 ("RISC-V: Enable PMEM drivers")

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 arch/riscv/configs/defconfig
index f7f32448f160,fea1b17dbbd3..000000000000
--- a/arch/riscv/configs/defconfig
+++ b/arch/riscv/configs/defconfig
@@@ -123,8 -123,8 +124,9 @@@ CONFIG_MICROSEMI_PHY=
  CONFIG_INPUT_MOUSEDEV=y
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
+ CONFIG_SERIAL_8250_DW=y
  CONFIG_SERIAL_OF_PLATFORM=y
 +CONFIG_SERIAL_SH_SCI=y
  CONFIG_VIRTIO_CONSOLE=y
  CONFIG_HW_RANDOM=y
  CONFIG_HW_RANDOM_VIRTIO=y
@@@ -161,7 -161,7 +163,8 @@@ CONFIG_VIRTIO_MMIO=
  CONFIG_RPMSG_CHAR=y
  CONFIG_RPMSG_CTRL=y
  CONFIG_RPMSG_VIRTIO=y
 +CONFIG_ARCH_R9A07G043=y
+ CONFIG_LIBNVDIMM=y
  CONFIG_EXT4_FS=y
  CONFIG_EXT4_FS_POSIX_ACL=y
  CONFIG_EXT4_FS_SECURITY=y

Attachment: pgpaJpDllHlJy.pgp
Description: OpenPGP digital signature