Hi all,
On Thu, 23 Nov 2023 11:10:05 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the security tree got a conflict in:
>
> tools/perf/arch/s390/entry/syscalls/syscall.tbl
>
> between commit:
>
> d3968c974a24 ("tools/perf: Update tools's copy of s390 syscall table")
>
> from the perf-current tree and commit:
>
> 5f42375904b0 ("LSM: wireup Linux Security Module syscalls")
>
> from the security 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 tools/perf/arch/s390/entry/syscalls/syscall.tbl
> index 86fec9b080f6,5a422443cb16..000000000000
> --- a/tools/perf/arch/s390/entry/syscalls/syscall.tbl
> +++ b/tools/perf/arch/s390/entry/syscalls/syscall.tbl
> @@@ -455,7 -455,6 +455,10 @@@
> 450 common set_mempolicy_home_node sys_set_mempolicy_home_node sys_set_mempolicy_home_node
> 451 common cachestat sys_cachestat sys_cachestat
> 452 common fchmodat2 sys_fchmodat2 sys_fchmodat2
> -453 common lsm_get_self_attr sys_lsm_get_self_attr sys_lsm_get_self_attr
> -454 common lsm_set_self_attr sys_lsm_set_self_attr sys_lsm_set_self_attr
> -455 common lsm_list_modules sys_lsm_list_modules sys_lsm_list_modules
> +453 common map_shadow_stack sys_map_shadow_stack sys_map_shadow_stack
> +454 common futex_wake sys_futex_wake sys_futex_wake
> +455 common futex_wait sys_futex_wait sys_futex_wait
> +456 common futex_requeue sys_futex_requeue sys_futex_requeue
> ++459 common lsm_get_self_attr sys_lsm_get_self_attr sys_lsm_get_self_attr
> ++460 common lsm_set_self_attr sys_lsm_set_self_attr sys_lsm_set_self_attr
> ++461 common lsm_list_modules sys_lsm_list_modules sys_lsm_list_modules
This is now a conflict between the security tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpLIdE7ozPkg.pgp
Description: OpenPGP digital signature
