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

2021-04-09 Thread 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  
> 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).
>

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

2021-04-08 Thread Stephen Rothwell 
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/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).
-- 
Cheers,
Stephen Rothwell

diff --cc arch/alpha/kernel/syscalls/syscall.tbl
index c5f7e595adab,4240f21b10b3..
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@@ -482,4 -482,6 +482,7 @@@
  550   common  process_madvise sys_process_madvise
  551   common  epoll_pwait2sys_epoll_pwait2
  552   common  mount_setattr   sys_mount_setattr
 +553   common  quotactl_path   sys_quotactl_path
+ 554   common  landlock_create_ruleset sys_landlock_create_ruleset
+ 555   common  landlock_add_rule   sys_landlock_add_rule
+ 556   common  landlock_restrict_self  sys_landlock_restrict_self
diff --cc arch/arm/tools/syscall.tbl
index 90cbe207cf3e,161423a5d773..
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@@ -456,4 -456,6 +456,7 @@@
  440   common  process_madvise sys_process_madvise
  441   common  epoll_pwait2sys_epoll_pwait2
  442   common  mount_setattr   sys_mount_setattr
 +443   common  quotactl_path   sys_quotactl_path
+ 444   common  landlock_create_ruleset sys_landlock_create_ruleset
+ 445   common  landlock_add_rule   sys_landlock_add_rule
+ 446   common  landlock_restrict_self  sys_landlock_restrict_self
diff --cc arch/arm64/include/asm/unistd.h
index d1f7d35f986e,727bfc3be99b..
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
diff --cc arch/arm64/include/asm/unistd32.h
index 8361c5138e5f,fdfe06bae3fc..
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@@ -893,8 -893,12 +893,14 @@@ __SYSCALL(__NR_process_madvise, sys_pro
  __SYSCALL(__NR_epoll_pwait2, compat_sys_epoll_pwait2)
  #define __NR_mount_setattr 442
  __SYSCALL(__NR_mount_setattr, sys_mount_setattr)
 +#define __NR_quotactl_path 443
 +__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
+ #define __NR_landlock_create_ruleset 444
+ __SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
+ #define __NR_landlock_add_rule 445
+ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule)
+ #define __NR_landlock_restrict_self 446
+ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
  
  /*
   * Please add new compat syscalls above this comment and update
diff --cc arch/ia64/kernel/syscalls/syscall.tbl
index c072cd459bb5,48dbbc95a01f..
--- a/arch/ia64/kernel/syscalls/syscall.tbl
+++ b/arch/ia64/kernel/syscalls/syscall.tbl
@@@ -363,4 -363,6 +363,7 @@@
  440   common  process_madvise sys_process_madvise
  441   common  epoll_pwait2sys_epoll_pwait2
  442   common  mount_setattr   sys_mount_setattr
 +443   common  quotactl_path   sys_quotactl_path
+ 444   common  landlock_create_ruleset sys_landlock_create_ruleset
+ 445   common  landlock_add_rule   sys_landlock_add_rule
+ 446   common  landlock_restrict_self  sys_landlock_restrict_self
diff --cc arch/m68k/kernel/syscalls/syscall.tbl
index 5e9f81073ff4,595108bbbe42..
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@@ -442,4 -442,6

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

2021-03-18 Thread Stephen Rothwell 
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
  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")

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 arch/alpha/kernel/syscalls/syscall.tbl
index c5f7e595adab,0924a3ac7bd9..
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@@ -482,4 -482,6 +482,7 @@@
  550   common  process_madvise sys_process_madvise
  551   common  epoll_pwait2sys_epoll_pwait2
  552   common  mount_setattr   sys_mount_setattr
 -553   common  landlock_create_ruleset sys_landlock_create_ruleset
 -554   common  landlock_add_rule   sys_landlock_add_rule
 -555   common  landlock_restrict_self  sys_landlock_restrict_self
 +553   common  quotactl_path   sys_quotactl_path
++554   common  landlock_create_ruleset sys_landlock_create_ruleset
++555   common  landlock_add_rule   sys_landlock_add_rule
++556   common  landlock_restrict_self  sys_landlock_restrict_self
diff --cc arch/arm/tools/syscall.tbl
index 90cbe207cf3e,dc1134b34cea..
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@@ -456,4 -456,6 +456,7 @@@
  440   common  process_madvise sys_process_madvise
  441   common  epoll_pwait2sys_epoll_pwait2
  442   common  mount_setattr   sys_mount_setattr
 -443   common  landlock_create_ruleset sys_landlock_create_ruleset
 -444   common  landlock_add_rule   sys_landlock_add_rule
 -445   common  landlock_restrict_self  sys_landlock_restrict_self
 +443   common  quotactl_path   sys_quotactl_path
++444   common  landlock_create_ruleset sys_landlock_create_ruleset
++445   common  landlock_add_rule   sys_landlock_add_rule
++446   common  landlock_restrict_self  sys_landlock_restrict_self
diff --cc arch/arm64/include/asm/unistd.h
index d1f7d35f986e,d1cc2849dc00..
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@@ -38,7 -38,7 +38,7 @@@
  #define __ARM_NR_compat_set_tls   (__ARM_NR_COMPAT_BASE + 5)
  #define __ARM_NR_COMPAT_END   (__ARM_NR_COMPAT_BASE + 0x800)
  
- #define __NR_compat_syscalls  444
 -#define __NR_compat_syscalls  446
++#define __NR_compat_syscalls  447
  #endif
  
  #define __ARCH_WANT_SYS_CLONE
diff --cc arch/arm64/include/asm/unistd32.h
index 8361c5138e5f,54e11bce7677..
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@@ -893,8 -893,12 +893,14 @@@ __SYSCALL(__NR_process_madvise, sys_pro
  __SYSCALL(__NR_epoll_pwait2, compat_sys_epoll_pwait2)
  #define __NR_mount_setattr 442
  __SYSCALL(__NR_mount_setattr, sys_mount_setattr)
 -#define __NR_landlock_create_ruleset 443
 +#define __NR_quotactl_path 443
 +__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
++#define __NR_landlock_create_ruleset 444
+ __SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
 -#define __NR_landlock_add_rule 444
++#define __NR_landlock_add_rule 445
+ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule)
 -#define __NR_landlock_restrict_self 445
++#define __NR_landlock_restrict_self 446
+ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
  
  /*
   * Please add new compat syscalls above this comment and update
diff --cc arch/ia64/kernel/syscalls/syscall.tbl
index c072cd459bb5,1bb35159561a..
--- a/arch/ia64/kernel/syscalls/syscall.tbl
+++ b/arch/ia64/kernel/syscalls/syscall.tbl
@@@ -363,4 -363,6 +363,7 @@@
  440   common  process_madvise sys_process_madvise