diff mbox series

linux-next: manual merge of the security tree with the asm-generic, block and tip trees

Message ID 20231027125006.58d5e94f@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the security tree with the asm-generic, block and tip trees |

Commit Message

Stephen Rothwell Oct. 27, 2023, 1:50 a.m. UTC 
  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/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 commits:

  2fd0ebad27bc ("arch: Reserve map_shadow_stack() syscall number for all architectures")
  9f6c532f59b2 ("futex: Add sys_futex_wake()")
  cb8c4312afca ("futex: Add sys_futex_wait()")
  0f4b5f972216 ("futex: Add sys_futex_requeue()")

from the asm-generic, block and tip trees and commit:

  6d54f25e4605 ("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.

Comments

Paul Moore Oct. 28, 2023, 3:29 p.m. UTC | #1 
On Thu, Oct 26, 2023 at 9:50 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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/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 commits:
>
>   2fd0ebad27bc ("arch: Reserve map_shadow_stack() syscall number for all architectures")
>   9f6c532f59b2 ("futex: Add sys_futex_wake()")
>   cb8c4312afca ("futex: Add sys_futex_wait()")
>   0f4b5f972216 ("futex: Add sys_futex_requeue()")
>
> from the asm-generic, block and tip trees and commit:
>
>   6d54f25e4605 ("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.

Thanks Stephen, those changes look correct to me, I'll update the LSM
tree once the asm-generic, block, and tip tree changes make their way
to Linus.
diff mbox series

Patch

diff --cc arch/alpha/kernel/syscalls/syscall.tbl
index 18c842ca6c32,01f4d0889a36..000000000000
--- a/arch/alpha/kernel/syscalls/syscall.tbl
diff --cc arch/arm/tools/syscall.tbl
index 584f9528c996,e12db7b9fb8d..000000000000
--- a/arch/arm/tools/syscall.tbl
diff --cc arch/arm64/include/asm/unistd.h
index 531effca5f1f,f33190f17ebb..000000000000
--- a/arch/arm64/include/asm/unistd.h
diff --cc arch/arm64/include/asm/unistd32.h
index 9f7c1bf99526,557345b38893..000000000000
--- a/arch/arm64/include/asm/unistd32.h
diff --cc arch/m68k/kernel/syscalls/syscall.tbl
index 7a4b780e82cb,215547a74374..000000000000
--- a/arch/m68k/kernel/syscalls/syscall.tbl
diff --cc arch/microblaze/kernel/syscalls/syscall.tbl
index 5b6a0b02b7de,24174dc2045f..000000000000
--- a/arch/microblaze/kernel/syscalls/syscall.tbl
diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl
index a842b41c8e06,dc3395c37b1e..000000000000
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl
diff --cc arch/mips/kernel/syscalls/syscall_n64.tbl
index 116ff501bf92,06cad00543e8..000000000000
--- a/arch/mips/kernel/syscalls/syscall_n64.tbl
diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl
index 525cc54bc63b,6ecc14091da3..000000000000
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl
diff --cc arch/parisc/kernel/syscalls/syscall.tbl
index a47798fed54e,5b321bb46374..000000000000
--- a/arch/parisc/kernel/syscalls/syscall.tbl
diff --cc arch/powerpc/kernel/syscalls/syscall.tbl
index 7fab411378f2,491eea2f88ba..000000000000
--- a/arch/powerpc/kernel/syscalls/syscall.tbl
diff --cc arch/s390/kernel/syscalls/syscall.tbl
index 7fa9b531d095,653400f82211..000000000000
--- a/arch/s390/kernel/syscalls/syscall.tbl
diff --cc arch/sh/kernel/syscalls/syscall.tbl
index 363fae0fe9bf,a4bc4047858e..000000000000
--- a/arch/sh/kernel/syscalls/syscall.tbl
diff --cc arch/sparc/kernel/syscalls/syscall.tbl
index 7bcaa3d5ea44,b134ad689789..000000000000
--- a/arch/sparc/kernel/syscalls/syscall.tbl
diff --cc arch/x86/entry/syscalls/syscall_32.tbl
index c8fac5205803,e921e0d6c4b3..000000000000
--- a/arch/x86/entry/syscalls/syscall_32.tbl
diff --cc arch/x86/entry/syscalls/syscall_64.tbl
index 8cb8bf68721c,b70920626b8c..000000000000
--- a/arch/x86/entry/syscalls/syscall_64.tbl
diff --cc arch/xtensa/kernel/syscalls/syscall.tbl
index 06eefa9c1458,e1fe5ed7cad8..000000000000
--- a/arch/xtensa/kernel/syscalls/syscall.tbl
diff --cc include/uapi/asm-generic/unistd.h
index d087a2cf86c7,f10906c71711..000000000000
--- a/include/uapi/asm-generic/unistd.h