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

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 > wrote: >> >> Today's linux-next merge of the security tree got conflicts in: >> >> arch/alpha/kernel/syscalls/syscall.tbl >> arch/arm/tools/syscall.tb

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

Hi all, On Fri, 19 Mar 2021 13:05:51 +1100 Stephen Rothwell 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/i

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

Hi all, 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 arc