linux-kernel - linux-next: manual merge of the vfs tree with the m68k tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200113095037.156597ff@canb.auug.org.au>
Date:   Mon, 13 Jan 2020 09:50:37 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Al Viro <viro@...IV.linux.org.uk>,
        Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kars de Jong <jongk@...ux-m68k.org>,
        Aleksa Sarai <cyphar@...har.com>
Subject: linux-next: manual merge of the vfs tree with the m68k tree

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  arch/m68k/kernel/syscalls/syscall.tbl

between commit:

  e8bb2a2a1d51 ("m68k: Wire up clone3() syscall")

from the m68k tree and commit:

  0a51692d49ec ("open: introduce openat2(2) syscall")

from the vfs 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/m68k/kernel/syscalls/syscall.tbl
index a00a5d0db602,2559925f1924..000000000000
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@@ -434,4 -434,5 +434,5 @@@
  432	common	fsmount				sys_fsmount
  433	common	fspick				sys_fspick
  434	common	pidfd_open			sys_pidfd_open
 -# 435 reserved for clone3
 +435	common	clone3				__sys_clone3
+ 437	common	openat2				sys_openat2

Content of type "application/pgp-signature" skipped