From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Moore <paul@paul-moore.com>
Cc: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>,
Namhyung Kim <namhyung@kernel.org>,
Casey Schaufler <casey@schaufler-ca.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the security tree with the perf-current tree
Date: Wed, 6 Dec 2023 10:02:30 +1100 [thread overview]
Message-ID: <20231206100230.7d29859d@canb.auug.org.au> (raw)
In-Reply-To: <20231123111005.432dfc56@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2217 bytes --]
Hi all,
On Thu, 23 Nov 2023 11:10:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2023-12-05 23:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-23 0:10 linux-next: manual merge of the security tree with the perf-current tree Stephen Rothwell
2023-12-05 23:02 ` Stephen Rothwell [this message]
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=20231206100230.7d29859d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnaldo.melo@gmail.com \
--cc=casey@schaufler-ca.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=paul@paul-moore.com \
/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).