* linux-next: manual merge of the edac-amd tree with the tile tree
@ 2015-06-01 7:02 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-06-01 7:02 UTC (permalink / raw)
To: Borislav Petkov, Chris Metcalf; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 922 bytes --]
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 sfr@canb•auug.org.au
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-01 7:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-01 7:02 linux-next: manual merge of the edac-amd tree with the tile tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox