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 properties")
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.
--
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
Attachment:
pgpP7VvoHDHxc.pgp
Description: OpenPGP digital signature
