From patchwork Tue Oct 31 00:18:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 159894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2590214vqb; Mon, 30 Oct 2023 17:19:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHfyQodNjkq7hjQlzkuqrlBFvmDnvEDCtFgpkAaU5RvSxnIb93ooDV/LoYx4EOBDHIBTDKv X-Received: by 2002:a17:902:ec88:b0:1cc:5306:e8a3 with SMTP id x8-20020a170902ec8800b001cc5306e8a3mr1907407plg.3.1698711551934; Mon, 30 Oct 2023 17:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698711551; cv=none; d=google.com; s=arc-20160816; b=s48GCZRxM8ZZoPop6PvFT46i+NYYnbtvGtNV18iP2gh0wVOpM/lu/SRckJBEp5uaxc vMdMubes5x27h3bbx+edSkrBd7dLgM17raCcA5KkVtD6DNEssHfo5wllHtIPpw8p2LKY cx6Ks7NFi0wQM988Gr3WmAprqARyjNO2RJ45iwVbyauxb4XibTwZtkYl7PLp3pqvyGX8 8Nh2sV9Nx1ZzpxrYnMTBd8iYjDJSgPHugvZIsKX2ihiozm9iHnagcb3xaCo0s3C7FHzx X13xyoQYTIv2Ea2TDr7gZLKGEjOlNpF8YNdvHdTkuIOk7A3LA0sgnFMBLfstTTjm81Js HTyA== 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=SSWBNWsb7c7zs1jWr8xla2C0vOE4NNYy9+dLWpLpJUo=; fh=JsujEWqhOLPxnozvXzJiEnn0mHOx4hrjn2E8RTHyxqw=; b=0fdXDw0OGCNj+kQAaUKgjHHtU+hMBqiCu2yAFdQg8tUjkMMLjjgBKpq21ClRVXEJVS 4zQ9GrLIOn6XbD9ksKZ4t8F98CGlWBOf07y9PyqsxJmQqhTc9qf5SSUFBQk5y2bE210n Z9Y8oidtkbsaj34nDeJ6qUWJ0dtO2LVXBsSfuMV3YfKBcw+WBcC6uF+hND+DiVO8Vy/2 aASmDXEDhL2qj7oPIfKOHQ4vaCDUDKrVq7W0uvJwXaXVR/RXL6e/Mz5XLe4j/1oDTODG /yR8O1Wc37QRmaxhB+6s9lcEDqN3e3oAw2bovoBRYruCoYYIuvdRmVVuAjZzD7lhI/nY quRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hQEZGycV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id e10-20020a17090301ca00b001c6069b659csi156367plh.384.2023.10.30.17.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 17:19:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hQEZGycV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 49B5B80B7C29; Mon, 30 Oct 2023 17:19:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236434AbjJaASs (ORCPT + 33 others); Mon, 30 Oct 2023 20:18:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236423AbjJaASq (ORCPT ); Mon, 30 Oct 2023 20:18:46 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7EACB3; Mon, 30 Oct 2023 17:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698711519; bh=SSWBNWsb7c7zs1jWr8xla2C0vOE4NNYy9+dLWpLpJUo=; h=Date:From:To:Cc:Subject:From; b=hQEZGycVkuiJHEKX/Am4aFwLqvAxLwJldYQVCw1TCF5rI9LF4BH63O2AymAQD9VDl bys2hTUKZhXeecxY6pfFUnihd8wYTNz3yfr7Q1NYQx6Vhel0FyDupUEgq+tfqjHE3Z oEQZ9u2Ez7HiOlluYCzdFZ+D08FtfIt/8fEaDxqkzfv43m4YlVI9gTMJ5e5JK0hnoQ hWTLrCVVJUwshQY3QdS8J1GmnPhv3IyQ4U9yO5B+I3GxLobotgTM5wKNyxGg2cFBCe ejfzt8c3ySIV0wVMUPlONnqKtBb5HzvSaVLAr7YpdbfZy9B1xYNUZ3itKhxoQ4YTyO /C3efDc4qufYA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SK9jB65Mnz4x1R; Tue, 31 Oct 2023 11:18:38 +1100 (AEDT) Date: Tue, 31 Oct 2023 11:18:36 +1100 From: Stephen Rothwell To: David Sterba Cc: Christian Brauner , David Sterba , Filipe Manana , Jeff Layton , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the btrfs tree with Linus' tree Message-ID: <20231031111836.0ac433a9@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 30 Oct 2023 17:19:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781228164293427729 X-GMAIL-MSGID: 1781228164293427729 Hi all, Today's linux-next merge of the btrfs tree got conflicts in: fs/btrfs/file.c fs/btrfs/inode.c fs/btrfs/transaction.c between commit: b1c38a1338c9 ("btrfs: convert to new timestamp accessors") from Linus' tree and commits: 8b9d032225be ("btrfs: remove redundant root argument from btrfs_update_inode()") 0a5d0dc55fcb ("btrfs: remove redundant root argument from btrfs_update_inode_fallback()") 8b9d032225be ("btrfs: remove redundant root argument from btrfs_update_inode()") c6e8f898f56f ("btrfs: open code timespec64 in struct btrfs_inode") from the btrfs 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/btrfs/file.c index 278a4ea651e1,92419cb8508a..000000000000 --- a/fs/btrfs/file.c diff --cc fs/btrfs/inode.c index 6e3ce1aecb6e,b388505c91cc..000000000000 --- a/fs/btrfs/inode.c diff --cc fs/btrfs/transaction.c index 38a2775c5c7b,9694a3ca1739..000000000000 --- a/fs/btrfs/transaction.c