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=-5.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A75D1C433E6 for ; Wed, 24 Feb 2021 22:39:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6FCDB64F03 for ; Wed, 24 Feb 2021 22:39:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235510AbhBXWjn (ORCPT ); Wed, 24 Feb 2021 17:39:43 -0500 Received: from ozlabs.org ([203.11.71.1]:43839 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233034AbhBXWji (ORCPT ); Wed, 24 Feb 2021 17:39:38 -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 4Dm9nW3D18z9sBJ; Thu, 25 Feb 2021 09:38:55 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1614206336; bh=Rc3QiwgPzVRHJ9mxb8+bpBLad5vmlVEkzHBZ8PWvVO4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=uxFLncE66/CnPdZBdKiLUWkiPaL0CnfTVeF50LKFRIQcIyMkr8u3DDZMhNAH/cSPS mZ5gMg+bE68FErtCu8H2qdqSGPVsjPtiekQNUPkWvo1nZHWHcgY/Qw8P62fS9lC18q HsFwGUE1+7cyw7oRwlWqiNx12W8w7ulUoLOW7CQQV+BVCnHgCBa7uj6Mv351MLzq+D yKQ088PleXE7yJKY2+sPxJa9UPocYjuO4uTTCwUr5APLfFOe15sxmQlqTgRp48ga7X fl9VCi3YLsXFMnkWhua9Xipatp7Bv8ZHhbGcIc/R3G/bp3TyAMruzm9rA3+UzzGx3x uGGIRST6ijBSg== Date: Thu, 25 Feb 2021 09:38:52 +1100 From: Stephen Rothwell To: Al Viro Cc: Christian Brauner , Christian Brauner , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the pidfd tree with the vfs tree Message-ID: <20210225093852.668345a1@canb.auug.org.au> In-Reply-To: <20210215075514.2d1f8728@canb.auug.org.au> References: <20210125161706.05873f95@canb.auug.org.au> <20210215075514.2d1f8728@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Di8uM2MV_zh=UEMo9T5S7Iv"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Di8uM2MV_zh=UEMo9T5S7Iv Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 15 Feb 2021 07:55:14 +1100 Stephen Rothwell = wrote: >=20 > On Mon, 25 Jan 2021 16:17:06 +1100 Stephen Rothwell wrote: > >=20 > > Today's linux-next merge of the pidfd tree got a conflict in: > >=20 > > fs/coredump.c > >=20 > > between commit: > >=20 > > 8a3cc755b138 ("coredump: don't bother with do_truncate()") Now: 0016c9bb87a7 ("coredump: don't bother with do_truncate()") > >=20 > > from the vfs tree and commit: > >=20 > > 643fe55a0679 ("open: handle idmapped mounts in do_truncate()") > >=20 > > from the pidfd tree. > >=20 > > I fixed it up (the former removes dump_truncate(), so I did that) 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 >=20 > With the merge window about to open, this is a reminder that this > conflict still exists. This is now a conflict between the vfs tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/Di8uM2MV_zh=UEMo9T5S7Iv Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmA21XwACgkQAVBC80lX 0GwUGQf/Zw994BmJehth5KYaCHgkfsJCuV3XA5OvOFvVejU21b3PrJJjP4IYfV1d Xt2bftADEiiIJ69bD0S34VdCTIzijq+udMv5WPBJrbhnZ9VQsQ7DIUTLm74pQD5K KzMN23HkAa6IIRO0xeVilzn+r1BUIinLwQUZuUWPHVn11+ilidvBChGMh2PgiSm/ APTm7im7q38J0Kh7I8e1/gxld4+uhWEjEvYbhkhFLWVNuKRs9kzRjuVoj04J09FX I4EscdhSsdqncg7gGmi8RYnMBuwe9OgM0oak92yvDRFLgt0DLN1CpSn+y1lkmV97 PTZwa32s3xts8hQYqqmjuEefnDboYQ== =5tl6 -----END PGP SIGNATURE----- --Sig_/Di8uM2MV_zh=UEMo9T5S7Iv--