From: Dave Hansen <dave.hansen@intel•com>
To: Mark Brown <broonie@finisterre•sirena.org.uk>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H . Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Dave Hansen <dave.hansen@linux•intel.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nhat Pham <nphamcs@gmail•com>,
Rick Edgecombe <rick.p.edgecombe@intel•com>
Subject: Re: linux-next: manual merge of the tip tree with the origin tree
Date: Thu, 4 May 2023 07:16:30 -0700 [thread overview]
Message-ID: <d0ae6716-c87f-f03d-7b66-ea899eaa7258@intel.com> (raw)
In-Reply-To: <20230504131824.182744-1-broonie@finisterre.sirena.org.uk>
On 5/4/23 06:18, Mark Brown wrote:
> diff --cc arch/x86/entry/syscalls/syscall_64.tbl
> index 227538b0ce801,f65c671ce3b14..0000000000000
> --- a/arch/x86/entry/syscalls/syscall_64.tbl
> +++ b/arch/x86/entry/syscalls/syscall_64.tbl
> @@@ -372,7 -372,7 +372,8 @@@
> 448 common process_mrelease sys_process_mrelease
> 449 common futex_waitv sys_futex_waitv
> 450 common set_mempolicy_home_node sys_set_mempolicy_home_node
> -451 64 map_shadow_stack sys_map_shadow_stack
> +451 common cachestat sys_cachestat
> ++452 64 map_shadow_stack sys_map_shadow_stack
Hi Mark,
This will break the shadow stack selftest:
tools/testing/selftests/x86/test_shadow_stack.c
since it has:
#define __NR_map_shadow_stack 451
This also missed bumping:
#define __NR_syscalls 452
in include/uapi/asm-generic/unistd.h.
next prev parent reply other threads:[~2023-05-04 14:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 13:18 linux-next: manual merge of the tip tree with the origin tree Mark Brown
2023-05-04 14:16 ` Dave Hansen [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-27 13:43 broonie
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=d0ae6716-c87f-f03d-7b66-ea899eaa7258@intel.com \
--to=dave.hansen@intel$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=broonie@finisterre$(echo .)sirena.org.uk \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=nphamcs@gmail$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=rick.p.edgecombe@intel$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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