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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 139A5EB64D9 for ; Sun, 2 Jul 2023 23:42:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229504AbjGBXm4 (ORCPT ); Sun, 2 Jul 2023 19:42:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbjGBXmz (ORCPT ); Sun, 2 Jul 2023 19:42:55 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86AD7E45; Sun, 2 Jul 2023 16:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1688341371; bh=cT82u9M2a2EePk1o1W+cQtyYlEl7DZ7cY6auLzp8BiU=; h=Date:From:To:Cc:Subject:From; b=jnXtAPEuwhBteymoLB59+e+j2CMGi77ohfih17QgdpqxKcoI0tudIR8ZwxFt/bDCH B/HPNV1+p+NiwlNZGTzLEoTP3AJTO9G5NWux5zV/5ik1aMk2zjnByLxR+nZi7Uw6z/ x89Hx26FRfBQ4FspE92jd5P392kkS8sdeHcMKs9zb556TYSYzu7LFuCs14fEZ0vZIu anBkBlc/+0vE+/+1mnxG/PVJ8YvB/P7pjWwgrFoLV1wX2/8mUDhAyAZmHVVSWH4lnJ yji2MSVqJJoogHw2VFBX5zRzYHxqgdJAe8i/RqqgABQWbaXb8MTjW7djVOtqPvGsqo XrHqnoNoDjXyw== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QvQbH39rmz4wqX; Mon, 3 Jul 2023 09:42:51 +1000 (AEST) Date: Mon, 3 Jul 2023 09:42:50 +1000 From: Stephen Rothwell To: Christian Brauner Cc: Kees Cook , Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the pidfd tree with Linus' tree Message-ID: <20230703094250.40be7092@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/op6S6dTDrhgksTysqlmt/.f"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/op6S6dTDrhgksTysqlmt/.f Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the pidfd tree got conflicts in: kernel/pid.c kernel/pid_namespace.c between commits: b69f0aeb0689 ("pid: Replace struct pid 1-element array with flex-array") dd546618ba70 ("pid: use struct_size_t() helper") from Linus' tree and commit: 757777eef55b ("pid: Replace struct pid 1-element array with flex-array") from the pidfd tree. I fixed it up (I used the former version) 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 --Sig_/op6S6dTDrhgksTysqlmt/.f Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSiC3oACgkQAVBC80lX 0GxDUAgAnlfnyc/gO4w6PQj4KqsscdByned2Sm/xQ1/rpUqNSGlp5KFIXLNeqFdt 3pKNonWPSWSorVLOAozqHSXpd/szawmizGqleZ8LLeYKy3MOxZ8CbDZ81J3RJ051 VTcASdzRIJUkBz8yycaMaJ9xNwpdCMt8KX+OHMG+HNKwQzpw9qDL+Z+G0CyVugrC yqg+aHxIJy+x4j4pDi3EMc7rNFpKKacxlusD7od5802YuSbcqw41CAmavVvjnQgU WEUPS90a8pM69vy6Wy/20nPGQmLZWBiukTWn4F2PXIEH1lVLZZm6DOuCzTOXTbAn DUL/u97T/hSQrA2HnicD+k79Htlheg== =NmWj -----END PGP SIGNATURE----- --Sig_/op6S6dTDrhgksTysqlmt/.f--