linux-kernel - linux-next: manual merge of the akpm-current tree with the arm64-acpi 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]

Date:	Thu, 26 Mar 2015 19:49:22 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Will Deacon <will.deacon@....com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kees Cook <keescook@...omium.org>,
	Al Stone <al.stone@...aro.org>
Subject: linux-next: manual merge of the akpm-current tree with the
 arm64-acpi tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm64/Kconfig between commit dbdacfa963f7 ("ARM64 / ACPI: Select
ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64") from the
arm64-acpi tree and commit cbc0632906e6 ("mm: split ET_DYN ASLR from
mmap ASLR") from the akpm-current 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/arm64/Kconfig
index 8b965e2769eb,34f487d5d84e..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1,9 -1,7 +1,9 @@@
  config ARM64
  	def_bool y
 +	select ACPI_GENERIC_GSI if ACPI
 +	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
- 	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
  	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+ 	select ARCH_HAS_ELF_RANDOMIZE
  	select ARCH_HAS_GCOV_PROFILE_ALL
  	select ARCH_HAS_SG_CHAIN
  	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

Content of type "application/pgp-signature" skipped