From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Kees Cook <keescook@chromium.org>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: manual merge of the akpm-current tree with the kspp tree
Date: Thu, 3 Mar 2022 19:15:11 +1100 [thread overview]
Message-ID: <20220303191511.7bcd2272@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1386 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/Kconfig
between commit:
2792d84e6da5 ("usercopy: Check valid lifetime via stack depth")
from the kspp tree and commit:
29c91f123969 ("mm: generalize ARCH_HAS_FILTER_PGPROT")
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 mm/Kconfig
index 4b7663a91f18,67998bd3352e..000000000000
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@ -747,15 -750,9 +753,18 @@@ config IDLE_PAGE_TRACKIN
config ARCH_HAS_CACHE_LINE_SIZE
bool
+config ARCH_HAS_CURRENT_STACK_POINTER
+ bool
+ help
+ In support of HARDENED_USERCOPY performing stack variable lifetime
+ checking, an architecture-agnostic way to find the stack pointer
+ is needed. Once an architecture defines an unsigned long global
+ register alias named "current_stack_pointer", this config can be
+ selected.
+
+ config ARCH_HAS_FILTER_PGPROT
+ bool
+
config ARCH_HAS_PTE_DEVMAP
bool
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-03-03 8:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-03 8:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-25 10:37 linux-next: manual merge of the akpm-current tree with the kspp tree Stephen Rothwell
2020-11-25 10:05 Stephen Rothwell
2019-02-13 6:03 Stephen Rothwell
2018-01-15 4:57 Stephen Rothwell
2018-01-15 12:41 ` Arnd Bergmann
2018-01-15 20:07 ` Kees Cook
2017-11-02 8:05 Stephen Rothwell
2017-06-20 5:18 Stephen Rothwell
2017-06-20 5:15 Stephen Rothwell
2017-07-03 1:31 ` Stephen Rothwell
2017-02-17 4:53 Stephen Rothwell
2016-07-27 6:23 Stephen Rothwell
2016-06-22 4:58 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=20220303191511.7bcd2272@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@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 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.