Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 30 Apr 2020 16:26:39 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Zong Li <zong.li@sifive.com>,
        Dave Martin <Dave.Martin@arm.com>,
        Mark Brown <broonie@kernel.org>
Subject: linux-next: manual merge of the akpm-current tree with the arm64
 tree
Message-ID: <20200430162639.4eaba859@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.OnAhcc3kTN9.z/0SMfptII";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/.OnAhcc3kTN9.z/0SMfptII
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/arm64/Kconfig

between commit:

  ab7876a98a21 ("arm64: elf: Enable BTI at exec based on ELF program proper=
ties")

from the arm64 tree and commit:

  03a534dd08f3 ("arm64: mm: use ARCH_HAS_DEBUG_WX instead of arch defined")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/arm64/Kconfig
index b5d91fab64b0,787b7202676b..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -9,8 -9,9 +9,10 @@@ config ARM6
  	select ACPI_MCFG if (ACPI && PCI)
  	select ACPI_SPCR_TABLE if ACPI
  	select ACPI_PPTT if ACPI
 +	select ARCH_BINFMT_ELF_STATE
+ 	select ARCH_HAS_DEBUG_WX
  	select ARCH_HAS_DEBUG_VIRTUAL
+ 	select ARCH_HAS_DEBUG_VM_PGTABLE
  	select ARCH_HAS_DEVMEM_IS_ALLOWED
  	select ARCH_HAS_DMA_PREP_COHERENT
  	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI

--Sig_/.OnAhcc3kTN9.z/0SMfptII
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl6qb58ACgkQAVBC80lX
0GxifAf+Oe2ESLserO2H2vRLoYsz55j9ATJcnegjnGldBaEGvMXoh+QWFctuagPf
TUxTqo874Riizqz4tTJqjlkN4JJ/SQ90KgEwsNll/j/ziXT6fRpRaK47j/4uGXFZ
tT3K5j31AiW1AAg7xiCssgb0SlYpiCw4qAcru6vjiqWweG7zzM4Uv/llYCaVd1bO
dEjj7WESknEXKEndgAkwwqY7iiwrN5jn2m/IWRLR64go4sua5CLUWCUrDgXz/h1O
zOpJhDFhRuqVbKWJrYxU1MhzKiJ9Kvs1ZtZIqaO9aMjPYSs6jsjJtnclUZlj7oJ9
25devcpFDMA6FbSbGjpp2H+wE6EhKg==
=Gv+z
-----END PGP SIGNATURE-----

--Sig_/.OnAhcc3kTN9.z/0SMfptII--