* linux-next: manual merge of the tip tree with the origin tree
@ 2023-04-27 13:43 broonie
0 siblings, 0 replies; 3+ messages in thread
From: broonie @ 2023-04-27 13:43 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H . Peter Anvin, Peter Zijlstra
Cc: David Sterba, Josh Poimboeuf, Linux Kernel Mailing List,
Linux Next Mailing List
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
tools/objtool/check.c
between commit:
f372463124df5 ("btrfs: mark btrfs_assertfail() __noreturn")
from the origin tree and commits:
071c44e427815 ("sched/idle: Mark arch_cpu_idle_dead() __noreturn")
09c5ae30d0075 ("btrfs: Mark btrfs_assertfail() __noreturn")
9ea7e6b62c2bd ("init: Mark [arch_call_]rest_init() __noreturn")
from the tip 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.
diff --cc tools/objtool/check.c
index 931cdb7dba190,5b600bbf2389b..0000000000000
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the tip tree with the origin tree
2023-05-04 13:18 Mark Brown
@ 2023-05-04 14:16 ` Dave Hansen
0 siblings, 0 replies; 3+ messages in thread
From: Dave Hansen @ 2023-05-04 14:16 UTC (permalink / raw)
To: Mark Brown, Thomas Gleixner, Ingo Molnar, H . Peter Anvin,
Peter Zijlstra
Cc: Andrew Morton, Dave Hansen, Linux Kernel Mailing List,
Linux Next Mailing List, Nhat Pham, Rick Edgecombe
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the tip tree with the origin tree
@ 2023-05-04 13:18 Mark Brown
2023-05-04 14:16 ` Dave Hansen
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2023-05-04 13:18 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H . Peter Anvin, Peter Zijlstra
Cc: Andrew Morton, Dave Hansen, Linux Kernel Mailing List,
Linux Next Mailing List, Nhat Pham, Rick Edgecombe
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/entry/syscalls/syscall_64.tbl
between commit:
5c289a59b1d08 ("cachestat: implement cachestat syscall")
from the origin tree and commit:
a9d48cbbcc40b ("x86/shstk: Introduce map_shadow_stack syscall")
from the tip 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.
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
#
# Due to a historical design error, certain syscalls are numbered differently
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-04 14:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-27 13:43 linux-next: manual merge of the tip tree with the origin tree broonie
2023-05-04 13:18 Mark Brown
2023-05-04 14:16 ` Dave Hansen
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).