From patchwork Mon Apr 12 02:22:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12196675 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 37A74C43460 for ; Mon, 12 Apr 2021 02:22:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 10F2D6120B for ; Mon, 12 Apr 2021 02:22:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236413AbhDLCWc (ORCPT ); Sun, 11 Apr 2021 22:22:32 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:50175 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235857AbhDLCWc (ORCPT ); Sun, 11 Apr 2021 22:22:32 -0400 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 4FJXYw1gksz9sVq; Mon, 12 Apr 2021 12:22:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1618194133; bh=ayIvaJQH0Woyv4g17RCPUtqiLX70HEuG+RcFRW7RcZs=; h=Date:From:To:Cc:Subject:From; b=GJTv1IGsO4SBmeCgjfjuvW3iF6ViUncgAArKDCvledGOpiU2+uuyhCmaWIymdCta0 qigzhkAzJjGVXIMxcriWce1zEJiBxH3RAfkEgs4eSGkoqjepZt5HsOimY5THtO6/Qq Uu+TyGHRKcgDXbfrXS1QmxepalqnfywYK+gJRH7YiWmsV8lq6tMEh7/8AwRRJ7NVFN LAL+sDFN8G/N85ofymJHFYJHA5c4lbKQEdonFuFRJ0nVPJgog0FP5Tfd8yJcvLR+Wm Y7/R8N6vJIRJBIIg4rPrzq63oAe/xyjStMCtcAl0QkES+3gEYahaPX+7PaIqBaksRd W+F9F4Izcccsg== Date: Mon, 12 Apr 2021 12:22:11 +1000 From: Stephen Rothwell To: Al Viro , "Darrick J. Wong" , David Chinner , linux-xfs@vger.kernel.org Cc: Christoph Hellwig , Linux Kernel Mailing List , Linux Next Mailing List , Miklos Szeredi Subject: linux-next: manual merge of the vfs tree with the xfs tree Message-ID: <20210412122211.713ca71d@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 vfs tree got a conflict in: fs/xfs/xfs_ioctl.c between commits: ceaf603c7024 ("xfs: move the di_projid field to struct xfs_inode") 031474c28a3a ("xfs: move the di_extsize field to struct xfs_inode") b33ce57d3e61 ("xfs: move the di_cowextsize field to struct xfs_inode") 4800887b4574 ("xfs: cleanup xfs_fill_fsxattr") ee7b83fd365e ("xfs: use a union for i_cowextsize and i_flushiter") db07349da2f5 ("xfs: move the di_flags field to struct xfs_inode") 3e09ab8fdc4d ("xfs: move the di_flags2 field to struct xfs_inode") from the xfs tree and commit: 280cad4ac884 ("xfs: convert to fileattr") from the vfs tree. I fixed it up (I think - 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 708b77341a70,bbda105a2ce5..000000000000 --- a/fs/xfs/xfs_ioctl.c