From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44728C33CA9 for ; Sun, 12 Jan 2020 22:50:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11C8F2084D for ; Sun, 12 Jan 2020 22:50:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="qPkSFfty" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727323AbgALWus (ORCPT ); Sun, 12 Jan 2020 17:50:48 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:60179 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727222AbgALWus (ORCPT ); Sun, 12 Jan 2020 17:50:48 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 47wsPx47Psz9s29; Mon, 13 Jan 2020 09:50:45 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1578869446; bh=a40F7aV+hWzizltZThnoRmNQqVG+tCjrmJGUSDxJcSE=; h=Date:From:To:Cc:Subject:From; b=qPkSFftygoxCdS17z92QrtHv9IZ3zF+rd/I8zVakIY8AS3BRMixfMhN+g7sz3j6W/ f+QFBIC0m2RFFxO9Me6jtePAcPzele2+JyYgNMIpuajGTFkrmEp8s5pRSmVMhvgeG2 dTMEoewO8KLEmzZXUMUb78gvEJTeK6o7ZlfMwiI+qR+Kr8kvf/FQfWbsnoi1rRt8HO seTcNvMc9CRB08yEwXZFbu85M81GVa1yyoMQhC2hi1lV0Wq3x0ln08WIkRu3pzDdHb inB+txpbIivkbPJRmiup0kav3eX36A/G2W1mwuSU2oQ6tuDHJ3rOC+sMhE4z0sb7Ck CI+hLUMhRHH2Q== Date: Mon, 13 Jan 2020 09:50:37 +1100 From: Stephen Rothwell To: Al Viro , Geert Uytterhoeven Cc: Linux Next Mailing List , Linux Kernel Mailing List , Kars de Jong , Aleksa Sarai Subject: linux-next: manual merge of the vfs tree with the m68k tree Message-ID: <20200113095037.156597ff@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qdDVBgrf0IRmeQx=vnxyL/T"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/qdDVBgrf0IRmeQx=vnxyL/T Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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. --=20 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 --Sig_/qdDVBgrf0IRmeQx=vnxyL/T Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4bor0ACgkQAVBC80lX 0GxS6gf9EyIhphzB22czNbb6SV+mMX/x9U6I9YDZFvrKO9xvuH/3qi9JVZxVIn8J Acq62df3bJu4SOkn8C6a+xS5ZAx4IVWc8pWvnqdybxQuRiZXFsFOiN8smuJeP0k+ iPyg2JN5/me94oDIL9fAHhXmuviQeGrlYRHQfsdVijuDVb3ynqKOsHQKtE/vwv28 wGLSLcje7fGU9fet11c42ajD4+N+vOAUH9gOJCUxnvHxySPaxxGDb3njaClJfbW9 r2dSQwlSBvyJyeUCAx+bgE+dOA/B+I6wB4K5n6w1nKRnI8rmSFkjjKresytvaqWO iW3SJ3AbCM1xZfW8Sff7N8KFdHocJg== =qU5P -----END PGP SIGNATURE----- --Sig_/qdDVBgrf0IRmeQx=vnxyL/T--