From patchwork Thu Oct 27 20:53:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp501368wru; Thu, 27 Oct 2022 16:07:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6anS08hDRBczXNGIyGnysWpAs63dwTCopGWC7raZUfDJWDqx7MM/SRTXfydy1tZtbfOZBF X-Received: by 2002:a17:902:d4c5:b0:183:6e51:503 with SMTP id o5-20020a170902d4c500b001836e510503mr51406947plg.84.1666912052445; Thu, 27 Oct 2022 16:07:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666912052; cv=none; d=google.com; s=arc-20160816; b=DMEuGQmyn2xx5mdP/gAMuMCid2Vpe6TZIua47RAS9ujAdkD7RLF1weUiV6n/UZFMuJ +SXiTUkr9DCWXr5EXlLcnJTeIiDrqeRp+DGlFzy+hGPqBAfRFaHyCyplEbaFwct3indc 960dHiXjFAroyUrmm4so/026gdeWTtQirv4cxQ9uJ9TSOzB+ZkNAlG4PQzOO37sYFMjh yeN1Qkp/cvtpf7XzKyy2fHUkvnlmHpp2Iu2jbskW/bZzcFA2FT01vuIC0dEDmg9pUDI3 L/109JvIlANzkyUt6el21xK8ngalIt4Y4EtdRBpSmInMOC1QcX5OJR9s6zt0aqy3giBk hx+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=8I9suYjvm0/gjSj88Itrh+YEVeaA3Y6GK6uQANsUn/k=; b=vTfvO+Z8TpTmViEHmTrVbq/6Mq67eTZC0WvCgySmDSEwz7R4Uj6asnn078ETMqnJVf uQJOC6KS0Wi3yNovdkJqXwZSXs60gXiuuWxKDvmU3yReV3xBrzv2xXEAd0mKxbX2PAxU WA6bylLlrzrDBXTfJfw6c8OrPgr7qVhg9HTHQMJwBjd7VHx8KeQ0fw2ojO6xe8GUMjYR k2oMfxxGV8lfadivQ2MviB0pkUQoyz0q+8PYsFbP9c5lRAK0gHY773NJr4v8dKmId03u JclT9vOjel8yxs+hKUJERWykV5TiVgA3dh37jZqNmnO7LIvMVggSoclPsV98rqKAeeCQ eJ6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=HDhZWID6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i5-20020a63d445000000b0046b08e9060fsi2913539pgj.485.2022.10.27.16.07.18; Thu, 27 Oct 2022 16:07:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=HDhZWID6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234831AbiJ0WtD (ORCPT + 99 others); Thu, 27 Oct 2022 18:49:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234947AbiJ0Ws7 (ORCPT ); Thu, 27 Oct 2022 18:48:59 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAF84B44AB; Thu, 27 Oct 2022 15:48:55 -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 4Mz17P2d9kz4wgr; Fri, 28 Oct 2022 09:48:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1666910930; bh=8I9suYjvm0/gjSj88Itrh+YEVeaA3Y6GK6uQANsUn/k=; h=Date:From:To:Cc:Subject:From; b=HDhZWID6MVqEPB9hI6AYtYDgqesPnUo3K5WbNxoEQ3wbcQJcWKXv8BEn1qbQpJAlz Vc5vkn5gj6TiMBzfsZNnk4VOOE/jUuAPxthaNNUmxRkNzOKKoxmjsX6/VXH+yuqjy3 4rtTWoN2FJl3WMJ+nNdJU4UV6vKMYrGpR3RqbdjZdKVNwseWJhhS2rVL4kVmkx+a1h DFAlSianui0tWqpF9zIpJ1IiB6704ESgRi5rl+bVsbvjtE7RqQn+d00rZvL2B0+OJi AeGXoGAjAaIxBIU/3dLZZs9tA0eht6q4vSWMnDs7RPnHbseqZ4YzJR750+hK/RCjtM ZeEOaiEFNdYFg== Date: Fri, 28 Oct 2022 07:53:14 +1100 From: Stephen Rothwell To: David Sterba , Christian Brauner , Seth Forshee Cc: "Christian Brauner (Microsoft)" , David Sterba , Josef Bacik , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the btrfs tree with the vfs-idmapping tree Message-ID: <20221028075314.0ad17cff@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747883972343300057?= X-GMAIL-MSGID: =?utf-8?q?1747883972343300057?= Hi all, Today's linux-next merge of the btrfs tree got a conflict in: fs/btrfs/ctree.h between commit: 138060ba92b3 ("fs: pass dentry to set acl method") from the vfs-idmapping tree and commit: 6ef78f46e652 ("btrfs: move acl prototypes into acl.h") from the btrfs tree. I fixed it up (I used the latter version of this file and applied the following merge fix patch) 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. From: Stephen Rothwell Date: Fri, 28 Oct 2022 09:44:23 +1100 Subject: [PATCH] btrfs: for up for "fs: pass dentry to set acl method" Signed-off-by: Stephen Rothwell --- fs/btrfs/acl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/acl.h b/fs/btrfs/acl.h index 45197b4f73bf..39bd36e6eeb7 100644 --- a/fs/btrfs/acl.h +++ b/fs/btrfs/acl.h @@ -6,7 +6,7 @@ #ifdef CONFIG_BTRFS_FS_POSIX_ACL struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu); -int btrfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, +int btrfs_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry, struct posix_acl *acl, int type); int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode, struct posix_acl *acl, int type);