From patchwork Mon Apr 19 00:49: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: 12210593 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 5BD02C43460 for ; Mon, 19 Apr 2021 00:50:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43B86610CC for ; Mon, 19 Apr 2021 00:50:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235636AbhDSAu3 (ORCPT ); Sun, 18 Apr 2021 20:50:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233117AbhDSAu3 (ORCPT ); Sun, 18 Apr 2021 20:50:29 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E109C06174A; Sun, 18 Apr 2021 17:50:00 -0700 (PDT) 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 4FNpBB5c7xz9tlC; Mon, 19 Apr 2021 10:49:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1618793396; bh=RvcQsImDVi/p3uATnp9KP+phSL29G3tjajJIKF67gxM=; h=Date:From:To:Cc:Subject:From; b=DVl/CvV8fFjpm4hBDqeS4IwJs5wZkjX3zZhM97fJwyogTGQ2ZbWeFWP+CucT5rssI JcqAcTQAfbbON6mDUCRDxDZANOK5DfEWjMOB+zZONKf7e8ji+O37h5Pod1MZvYkmwx nkm3CzSFVTR19BJecPCS5rAkmU9vytCp5mpcJ0w9Jkj8k+eRhrEoxp/RX0MsSEL373 qZf3jEaVpKA6+xYUB/QFvVuQA3RB728FMdoUv78HVabhUYsSxe0ZpuvLlAJCdjpRSV ieL+3mgYIdOrrYnpbhrcZ3eGX4NO9ZDnaIbhyHlVlvLP79KtU1tNAfcml4NrDDBx8S WXKaTNazsGHYg== Date: Mon, 19 Apr 2021 10:49:48 +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: <20210419104948.7be23015@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 commit: b2197a36c0ef ("xfs: remove XFS_IFEXTENTS") from the xfs tree and commit: 9fefd5db08ce ("xfs: convert to fileattr") from the vfs 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 bf490bfae6cb,bbda105a2ce5..000000000000 --- a/fs/xfs/xfs_ioctl.c