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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 1 Jun 2015 17:02:43 +1000

Hi Borislav,

Today's linux-next merge of the edac-amd tree got a conflict in
arch/tile/Kconfig between commit 5bf6c07a1843 ("tile: add
<asm/word-at-a-time.h> and enable support functions") from the tile
tree and commit b01aec9b2c7d ("EDAC: Cleanup atomic_scrub mess") from
the edac-amd tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/tile/Kconfig
index bcc7d66976f1,59cf0b911898..000000000000
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -29,8 -28,7 +29,9 @@@ config TIL
  	select HAVE_DEBUG_STACKOVERFLOW
  	select ARCH_WANT_FRAME_POINTERS
  	select HAVE_CONTEXT_TRACKING
 +	select GENERIC_STRNCPY_FROM_USER
 +	select GENERIC_STRNLEN_USER
+ 	select EDAC_SUPPORT
  
  # FIXME: investigate whether we need/want these options.
  #	select HAVE_IOREMAP_PROT