linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
	Dan Li <ashimida@linux.alibaba.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kspp tree with Linus' tree
Date: Tue, 15 Mar 2022 21:49:24 +1100	[thread overview]
Message-ID: <20220315214924.27f5e360@canb.auug.org.au> (raw)

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

Hi all,

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

  arch/arm64/Kconfig

between commit:

  6e2edd6371a4 ("arm64: Ensure execute-only permissions are not allowed without EPAN")

from Linus' tree and commit:

  afcf5441b9ff ("arm64: Add gcc Shadow Call Stack support")

from the kspp 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 181679ffedac,de01e77f4db7..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1259,7 -1252,10 +1260,7 @@@ config HW_PERF_EVENT
  	def_bool y
  	depends on ARM_PMU
  
- # Supported by clang >= 7.0
 -config ARCH_HAS_FILTER_PGPROT
 -	def_bool y
 -
+ # Supported by clang >= 7.0 or GCC >= 12.0.0
  config CC_HAVE_SHADOW_CALL_STACK
  	def_bool $(cc-option, -fsanitize=shadow-call-stack -ffixed-x18)
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2022-03-15 10:51 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-15 10:49 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-09-14  4:04 linux-next: manual merge of the kspp tree with Linus' tree Stephen Rothwell
2021-06-11  6:17 Stephen Rothwell
2020-10-09  6:41 Stephen Rothwell
2020-06-29  5:43 Stephen Rothwell
2020-04-08  2:00 Stephen Rothwell
2020-01-06  4:48 Stephen Rothwell
2017-02-08  1:41 Stephen Rothwell
2016-11-08  2:31 Stephen Rothwell
2016-11-08 18:44 ` Kees Cook

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=20220315214924.27f5e360@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ashimida@linux.alibaba.com \
    --cc=catalin.marinas@arm.com \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).