From patchwork Tue Sep 26 00:17:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 144804 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1801308vqu; Tue, 26 Sep 2023 03:11:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyJVB6xcVSExiBnCtKD0KM9L30R/XPbvfMGcFF6OpaHDmVlbcLwSrOX5+ZPH2z2keHkBjn X-Received: by 2002:a05:6a21:7891:b0:153:353e:5e39 with SMTP id bf17-20020a056a21789100b00153353e5e39mr8776073pzc.51.1695723079557; Tue, 26 Sep 2023 03:11:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695723079; cv=none; d=google.com; s=arc-20160816; b=v9uS9CY/tT6eaAL4WahEzLvpIXJPF6ofWO4rEhlNvWAsz0PUp9SuP5mocVrXx8S7tF BquQWiFZBYBpxmPyT62UIWcfC2S8Jw8QU2FxJTBekP7sFvgaQRgMESwFcyPv54WEjYcZ wztbx8ZjbI6gwlU7mBqpdBfLCwOAUNp4+jrc2FPPQQTrckSM6EB1wUdzDniuDXl8/qjk RxBBXZX65Uxt7ORJfMztQ6Sbr9H10GCIiDWefADWBt3YkYtWzqfXvS8FYikh4Zlb+yd8 FsTTvsr6ICfDEapXuWRh4nQnr7z3UHQh9SYqn+R0vj+4rTm4RSIBnlgqd3oouyCtyLY/ zQuQ== 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=6pA/zaPvex5yELwVfoOjyd303wllUNzvBUF8400bCWo=; fh=i5dSJUbrx4x0bDefbB9Ls87FUHsIyIVoy5P+46PoCg4=; b=bjv1kCzb4xXT3d2NhJnGCofDck64K7xDJeDbilNCIcZUNsOBzxhIOJDue+Z27PLtqn lTwd+QZKY30h4Km0GydGz81kpp+GM1vNKmWsypOHVDW0fFHVzgJHuMRG0/cSZ9/MnAGR 5UrQLPcNkZeb8tcQSSD0bAoTsy4/fNyCCoxTjuCVVX4b3H+IUnZWRiBMFvsCi0ovg1lq NitJM9vQMdnnHkCZI935pu2oRtQ5Xh/t3R/uVqDEaJkC1yGddAoYLtV+ZNKsvMgvCtyo Gr7KpZUbMJ9gOvdCME3B3L2K2BwmE5WjXJYiVeUbAunr4fBsQ940F/YigsJ0ToG5kFoQ kfyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=pTNyKe50; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id o3-20020a170902d4c300b001bdf71d52b0si13187625plg.456.2023.09.26.03.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 03:11:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=pTNyKe50; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 77320806E14D; Mon, 25 Sep 2023 17:17:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229726AbjIZAR3 (ORCPT + 28 others); Mon, 25 Sep 2023 20:17:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbjIZAR2 (ORCPT ); Mon, 25 Sep 2023 20:17:28 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7EF410A; Mon, 25 Sep 2023 17:17:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695687440; bh=6pA/zaPvex5yELwVfoOjyd303wllUNzvBUF8400bCWo=; h=Date:From:To:Cc:Subject:From; b=pTNyKe50ZmrVhi1KeLlFt+dD/+nQn+4vhUD3Tj6LF44QXfBdQMtHl+7dII8tQbUaD zCBUiFCW5Uh7kMSUK0cyY5oOAGQl6Vy/Ho+73lqtZI5Ri2LVn270RhZauNVf0q4alw E87ZHx7gPsOOEqlzSYPUDq5Xm2jhSnprw0TKjLA78VtGkofDtS/0WICkHcwBlR9VBQ 91wfoOKK1YPgoSHQe9wA8O0jtbz9FcAMnuZT1RM1/pBK+2pJSZonxMWGdyTXbnpGg6 0lRCRJhfR4aFnb4iat8KOq66w6SPX54nVQ5oWQT5/ZRgGVTBH/DvaUL2fmjs3yW67W 6xuGxWP0bIZng== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RvgKq33jSz4xGC; Tue, 26 Sep 2023 10:17:19 +1000 (AEST) Date: Tue, 26 Sep 2023 10:17:17 +1000 From: Stephen Rothwell To: David Sterba , Andrew Morton Cc: Christoph Hellwig , David Sterba , Linux Kernel Mailing List , Linux Next Mailing List , Qi Zheng Subject: linux-next: manual merge of the btrfs tree with the mm tree Message-ID: <20230926101717.0237a18a@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 25 Sep 2023 17:17:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778094523531460739 X-GMAIL-MSGID: 1778094523531460739 Hi all, Today's linux-next merge of the btrfs tree got a conflict in: fs/btrfs/super.c between commit: a95330e8e416 ("fs: super: dynamically allocate the s_shrink") from the mm tree and commit: dd99b78be273 ("btrfs: open block devices after superblock creation") 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/super.c index b1798bed68f2,c41ed5a78ea4..000000000000 --- a/fs/btrfs/super.c