Subject: linux-next: manual merge of the edac-amd tree with the risc-v tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Jul 2019 17:01:34 +1000

Hi all,

Today's linux-next merge of the edac-amd tree got a conflict in:

  arch/riscv/Kconfig

between commit:

  9e953cda5cdf ("riscv: Introduce huge page support for 32/64bit kernel")

from the risc-v tree and commit:

  a1ee570c831d ("EDAC/sifive: Add EDAC platform driver for SiFive SoCs")

from the edac-amd 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/Kconfig
index 8bf447b36955,4961deaa3b1d..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -51,8 -50,7 +51,9 @@@ config RISC
  	select ARCH_HAS_PTE_SPECIAL
  	select ARCH_HAS_MMIOWB
  	select HAVE_EBPF_JIT if 64BIT
 +	select ARCH_HAS_GIGANTIC_PAGE
 +	select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
+ 	select EDAC_SUPPORT
  
  config MMU
  	def_bool y