All of lore.kernel.org
 help / color / mirror / Atom feed
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
Date: Thu, 30 Apr 2020 16:26:39 +1000	[thread overview]
Message-ID: <20200430162639.4eaba859@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2020-04-30  6:26 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-30  6:26 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-08  6:04 linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2021-10-08  7:37 ` Will Deacon
2021-04-13  8:59 Stephen Rothwell
2021-04-13  9:14 ` Catalin Marinas
2020-12-03  8:06 Stephen Rothwell
2020-12-03 11:16 ` Catalin Marinas
2020-09-21  8:03 Stephen Rothwell
2020-09-21  8:12 ` Catalin Marinas
2020-10-13  7:34 ` Stephen Rothwell
2020-07-16  8:00 Stephen Rothwell
2020-07-16  8:23 ` Will Deacon
2020-04-29  6:53 Stephen Rothwell
2019-08-07  6:39 Stephen Rothwell
2018-12-13  6:01 Stephen Rothwell
2018-12-13 11:12 ` Will Deacon
2018-12-11  6:11 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
2018-12-11  6:12 ` linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2018-12-11 10:39   ` Will Deacon
2018-12-11  6:02 Stephen Rothwell
2018-09-24  4:38 Stephen Rothwell
2018-09-24  9:32 ` Catalin Marinas
2018-07-27 10:55 Stephen Rothwell
2018-08-16  0:11 ` Stephen Rothwell
2017-11-06  5:33 Stephen Rothwell
2016-09-27  6:03 Stephen Rothwell
2016-06-22  4:54 Stephen Rothwell
2015-12-16  5:01 Stephen Rothwell
2015-12-16 10:14 ` Will Deacon
2014-09-23  7:23 Stephen Rothwell
2014-09-23  8:36 ` Catalin Marinas
2014-07-24  8:42 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200430162639.4eaba859@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Dave.Martin@arm.com \
    --cc=akpm@linux-foundation.org \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=will@kernel.org \
    --cc=zong.li@sifive.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.