From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752215AbbCZItg (ORCPT ); Thu, 26 Mar 2015 04:49:36 -0400 Received: from ozlabs.org ([103.22.144.67]:59114 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751413AbbCZItd (ORCPT ); Thu, 26 Mar 2015 04:49:33 -0400 Date: Thu, 26 Mar 2015 19:49:22 +1100 From: Stephen Rothwell To: Andrew Morton , Will Deacon Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , Al Stone Subject: linux-next: manual merge of the akpm-current tree with the arm64-acpi tree Message-ID: <20150326194922.7325fc21@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/uGTEG92Yy1Rd8E5WY.REsBb"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/uGTEG92Yy1Rd8E5WY.REsBb Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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). --=20 Cheers, Stephen Rothwell sfr@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 --Sig_/uGTEG92Yy1Rd8E5WY.REsBb Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVE8gbAAoJEMDTa8Ir7ZwVeSgP/R4CsE+H5oXNvlzY2GEuRc5D cpq65wM0rwNQDmQdUoqxybMXlBUd43bfmJxyIF0KI15YMCvfcwQiudUAKVMioSq4 7HV8mIZRI5exiC7Z5oxvlvz20cgUCsZ3lTKRkZurf30TLJYHd1xG86AfVQWH86nC LRRq+IxN3ZmJDcWR1IXzZ+pidx/qNoRSxH31WnhmNEyidF2FWNXOsXotOLGsqMNw U4qmMtEmOi73ynr20ipt3oby6DTjlGejL+SIaSIZ3etVvtBPZtuQYM+DABvtCO1V /RFRpUirNYNZDjb7cAqyMEDEWL76YSQDmOJKiWjE+JlFQvrKn3vnZjZ3i9LYM3Eq NUsXvWWGsdDQochzBJpHzUW6TejUlJ1yh8OwYYa4hJBBWGc2/d4T5dbMX81qN2IX oDkFTSmYv9LyW1vgPxTwf4Bk9rwAnaVVI6RX4kLS+jZrj6au/xhBNajMqdAt+JvN fIlx73gQ7PybncnDg8t2IzokaovbPbYhvuo3PllozN5zfiP4JqZLLTLkP6pXcZrX Vjq/8hnkcLRo4kjkpRnK2NDL/qHT3knCDNiXu+bZAtXlc/q0Qw/Q1FP3pCzlgWXX ShCjYPtveAnEOhELpzOOHx7uYKaT890PF2KrMv2ULCwf3UEragU4K7CbC6tzeeVY 5QyQYuThF6SNavnLfn6y =8ABg -----END PGP SIGNATURE----- --Sig_/uGTEG92Yy1Rd8E5WY.REsBb--