From: "Mickaël Salaün" <mic@digikod•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
James Morris <jmorris@namei•org>, Jan Kara <jack@suse•cz>
Cc: "James Morris" <jamorris@linux•microsoft.com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Mickaël Salaün" <mic@linux•microsoft.com>,
"Sascha Hauer" <s.hauer@pengutronix•de>
Subject: Re: linux-next: manual merge of the security tree with the ext3 tree
Date: Fri, 9 Apr 2021 10:50:41 +0200 [thread overview]
Message-ID: <ec4beec7-b68e-55d2-6551-2a910d19ff11@digikod.net> (raw)
In-Reply-To: <20210409143954.22329cfa@canb.auug.org.au>
Looks good, thanks Stephen!
On 09/04/2021 06:39, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 19 Mar 2021 13:05:51 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>>
>> Today's linux-next merge of the security tree got conflicts in:
>>
>> arch/alpha/kernel/syscalls/syscall.tbl
>> arch/arm/tools/syscall.tbl
>> arch/arm64/include/asm/unistd.h
>> arch/arm64/include/asm/unistd32.h
>> arch/ia64/kernel/syscalls/syscall.tbl
>> arch/m68k/kernel/syscalls/syscall.tbl
>> arch/microblaze/kernel/syscalls/syscall.tbl
>> arch/mips/kernel/syscalls/syscall_n32.tbl
>> arch/mips/kernel/syscalls/syscall_n64.tbl
>> arch/mips/kernel/syscalls/syscall_o32.tbl
>> arch/parisc/kernel/syscalls/syscall.tbl
>> arch/powerpc/kernel/syscalls/syscall.tbl
>> arch/s390/kernel/syscalls/syscall.tbl
>> arch/sh/kernel/syscalls/syscall.tbl
>> arch/sparc/kernel/syscalls/syscall.tbl
>> arch/x86/entry/syscalls/syscall_32.tbl
>> arch/x86/entry/syscalls/syscall_64.tbl
>> arch/xtensa/kernel/syscalls/syscall.tbl
>> include/uapi/asm-generic/unistd.h
>>
>> between commit:
>>
>> fa8b90070a80 ("quota: wire up quotactl_path")
>>
>> from the ext3 tree and commit:
>>
>> 818946f8b806 ("arch: Wire up Landlock syscalls")
>
> This is now commit
>
> 9fbebb70210a ("arch: Wire up Landlock 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.
>
> The resolution now looks like below (since the lanlock syscall number
> have been updated).
>
prev parent reply other threads:[~2021-04-09 8:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 2:05 linux-next: manual merge of the security tree with the ext3 tree Stephen Rothwell
2021-04-09 4:39 ` Stephen Rothwell
2021-04-09 8:50 ` Mickaël Salaün [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=ec4beec7-b68e-55d2-6551-2a910d19ff11@digikod.net \
--to=mic@digikod$(echo .)net \
--cc=jack@suse$(echo .)cz \
--cc=jamorris@linux$(echo .)microsoft.com \
--cc=jmorris@namei$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mic@linux$(echo .)microsoft.com \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=sfr@canb$(echo .)auug.org.au \
/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