From patchwork Mon Jan 25 06:14:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12042977 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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 58C77C433E0 for ; Mon, 25 Jan 2021 06:15:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A4C422CAD for ; Mon, 25 Jan 2021 06:15:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725974AbhAYGPA (ORCPT ); Mon, 25 Jan 2021 01:15:00 -0500 Received: from ozlabs.org ([203.11.71.1]:47377 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725862AbhAYGO5 (ORCPT ); Mon, 25 Jan 2021 01:14:57 -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 4DPKMB6CVXz9sS8; Mon, 25 Jan 2021 17:14:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1611555255; bh=Ut/fFn4kETlfw8FIktdwRPKBuDMq0Oo4wQyuP+bntZc=; h=Date:From:To:Cc:Subject:From; b=s6Ymgs0YRnNq1q5dSLIuvBWbpMUwfl9H3gj+jHjUlRHPFR29+w4pFJ5U0oVY3Izf8 eenRt7+XpU0sO+jdSrBEji0aDbgAQMDNZWhVs66BXzyKOwPndeFqv4g4PIQJzvT8Aq UdXENZiTwRZAFbRVCJ/ZP9YGpNED/oQQfqHnhqYUYQMRKmpCYhuliPYyjlyO3DuLMC OeXfR5rNX0JK3d0YtVOmXfwPXPctw5qdKcAlGWOLh4E1kPdno/bdPIm1EPcFfQB03o k4vF686bXixKmMwurx0z/qVv+W1F3GT749UJe7kwhkAi4GAMwGF6VHi2TSqYuDlfQn zInvDdmxUeuTg== Date: Mon, 25 Jan 2021 17:14:14 +1100 From: Stephen Rothwell To: Christian Brauner , "Darrick J. Wong" , David Chinner , linux-xfs@vger.kernel.org Cc: Christian Brauner , Christoph Hellwig , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the pidfd tree with the xfs tree Message-ID: <20210125171414.41ed957a@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Hi all, Today's linux-next merge of the pidfd tree got a conflict in: fs/xfs/xfs_inode.c between commit: 01ea173e103e ("xfs: fix up non-directory creation in SGID directories") from the xfs tree and commit: f736d93d76d3 ("xfs: support idmapped mounts") 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. diff --cc fs/xfs/xfs_inode.c index e2a1db4cee43,95b7f2ba4e06..000000000000 --- a/fs/xfs/xfs_inode.c