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 s...@canb.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
pgpV2hOaQGnjh.pgp
Description: OpenPGP digital signature
