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 3B94CC433E0 for ; Fri, 10 Jul 2020 06:18:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 06F0620720 for ; Fri, 10 Jul 2020 06:18:17 +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="XqqlC1qC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727879AbgGJGSQ (ORCPT ); Fri, 10 Jul 2020 02:18:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727772AbgGJGSL (ORCPT ); Fri, 10 Jul 2020 02:18:11 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48D87C08C5CE; Thu, 9 Jul 2020 23:18:11 -0700 (PDT) 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 4B32sX0CGnz9sRK; Fri, 10 Jul 2020 16:18:07 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1594361888; bh=uebh7Nj+FZYez9qaSQRIVhMsqdQtviRjGVGzYgirTWo=; h=Date:From:To:Cc:Subject:From; b=XqqlC1qCopY/k+4JUsz77Op4qC/UktVCViUgw0QJ3im+6So+nyWLJ8LS46D+OWLG+ MzFukU5KFg1YvrvAjR72AM87GBaqUFbVXBecw8IMWxnXqzTAeMNcQlJpEO4DAkFFbJ oMwQHnHOycBTH0JjVHKvhLLluWVkxaquKBGrsxnnE6GSMt+iD8cYi2+Z72HnDXljPC nBTaY5+T8axvyReUyXc2CQa9LN0z7ZUnOgamn09BAQyTraeeEZR+lXhPB+3SDziCTr 29zN8qT1ytAA4xRlb/6zAf8j8Uquq7up19vdOvq7LpmmccBCiqyIOqlxu99Bm49Y4u ujx0b/PwUUOXw== Date: Fri, 10 Jul 2020 16:18:06 +1000 From: Stephen Rothwell To: Christian Brauner , Kees Cook Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the pidfd tree with the seccomp tree Message-ID: <20200710161806.28d8c856@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/BKyrhWxOocKHwTO5Q19txOk"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/BKyrhWxOocKHwTO5Q19txOk Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the pidfd tree got a conflict in: fs/file.c between commit: 21fec66fd4be ("fs: Move __scm_install_fd() to __receive_fd()") from the seccomp tree and commit: 60997c3d45d9 ("close_range: add CLOSE_RANGE_UNSHARE") from the pidfd 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 fs/file.c index 4fb111735d1d,340bc9569f9d..000000000000 --- a/fs/file.c +++ b/fs/file.c @@@ -18,7 -19,7 +19,8 @@@ #include #include #include +#include + #include =20 unsigned int sysctl_nr_open __read_mostly =3D 1024*1024; unsigned int sysctl_nr_open_min =3D BITS_PER_LONG; --Sig_/BKyrhWxOocKHwTO5Q19txOk Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8ICB4ACgkQAVBC80lX 0Gxb3gf/XR6DTlWiYpt8lqJWXNtw298QPZ+oY0HhzoIdMn5fmODYdVrvygpy0Ee0 hLE3ijXyEXgWvBfY+eiQ9Xj2lGbuXFnay2pfjJJXjA5YvdpE5p4dunEaqbte95Af 1YtpdFu+JvgPoSg7Xxzw6HIX0FMohG04N7NGZcLqz/w3ZZgEveBeGX0lDBmoff2c 5FX1ydeh04dnXEEbNDUlr2QsW01z58+6Hgr3x+Ov86F1JG2hA/pHJmYQ+vu2e3sy sVAeQtdPH8MKD3FPQor12c+D86BPlIQjwfs+NxbVCWyJuu3bUN+LOW5aXMtY40Td FQ0oRLXCYY2QgB/+UZ5JzDuAG/FX3w== =aYHZ -----END PGP SIGNATURE----- --Sig_/BKyrhWxOocKHwTO5Q19txOk--