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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150601170243.266e4727@canb.auug.org.au>
Date:	Mon, 1 Jun 2015 17:02:43 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Borislav Petkov <borislav.petkov@....com>,
	Chris Metcalf <cmetcalf@...hip.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the edac-amd tree with the tile tree

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@...b.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

Content of type "application/pgp-signature" skipped