Re: linux-next: manual merge of the security tree with the ext3 tree

[Mickaël Salaün]

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@xxxxxxxxxxxxxxxx> 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).
>