From patchwork Sun Feb 7 23:33:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12073575 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=unavailable 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 A6FC7C433E9 for ; Sun, 7 Feb 2021 23:34:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6878364E43 for ; Sun, 7 Feb 2021 23:34:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229626AbhBGXef (ORCPT ); Sun, 7 Feb 2021 18:34:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229587AbhBGXee (ORCPT ); Sun, 7 Feb 2021 18:34:34 -0500 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3065C061756; Sun, 7 Feb 2021 15:33:53 -0800 (PST) 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 4DYlpj3RWhz9rx6; Mon, 8 Feb 2021 10:33:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1612740830; bh=mUVAHkaKy3IiZ79jVV9e5g/cx4s3Sz9ehM7aiqphm7Y=; h=Date:From:To:Cc:Subject:From; b=aAzrvbRMXZmChzgc90gbY0JnzKbJaxXeV8oCfPNqDXgawaBshYHTrpDNdT3lktjwY J5Mh89e3SZyW8V7+jWqPKp0YPlW5ujxHTOIhngq1ZfG9YSIB+UvErQ7Qq/To9BDNVg Db0IYZ0VHMhrnFS6CRQlGANL10ELfPo9yT1vlBfSDfZYXXvz7E8U4LmZA3ZJ4+FFgm gbcieRCRR/cew5fDjBySzB2fgRttzftwzpd6vmDKHHyuuanC6vexIZNILv9myYBCtW lM96Xvd4cgSQxyUaod5CvYzIPGiFlr+lK8nqW3/YQy6OYtIqR0jrrjrp1IJfH6uf+d bZvjdTxS87htw== Date: Mon, 8 Feb 2021 10:33:48 +1100 From: Stephen Rothwell To: "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 xfs tree with the pidfd tree Message-ID: <20210208103348.1a0beef9@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 xfs tree got a conflict in: fs/xfs/xfs_ioctl.c between commit: f736d93d76d3 ("xfs: support idmapped mounts") from the pidfd tree and commit: 7317a03df703 ("xfs: refactor inode ownership change transaction/inode/quota allocation idiom") from the xfs 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_ioctl.c index 3d4c7ca080fb,248083ea0276..000000000000 --- a/fs/xfs/xfs_ioctl.c