From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Borislav Petkov <borislav.petkov@amd•com>,
Chris Metcalf <cmetcalf@ezchip•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the edac-amd tree with the tile tree
Date: Mon, 1 Jun 2015 17:02:43 +1000 [thread overview]
Message-ID: <20150601170243.266e4727@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2015-06-01 7:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150601170243.266e4727@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=borislav.petkov@amd$(echo .)com \
--cc=cmetcalf@ezchip$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox