From patchwork Mon Jun 26 03:09:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 112719 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7223572vqr; Sun, 25 Jun 2023 20:43:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ckh0O/wfJFnxv8i6zKkJ/iQLpfiwPTyyPEyt5D8HXzsE2MlUz+4Yl71XkTgGpUNcLUxRv X-Received: by 2002:a05:6358:a18:b0:132:f944:6f5 with SMTP id 24-20020a0563580a1800b00132f94406f5mr1774437rwa.11.1687750981220; Sun, 25 Jun 2023 20:43:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687750981; cv=none; d=google.com; s=arc-20160816; b=qI/342zVfLaAXtNukJ0XX3vvpM/XD6Wqhr+kJPIGr3Ul7evc8hMcXz8F0uFLYhR2wi kTYE+Z6YDg5wfVT9sQy/qAvmesVKsQbbVLt0jE6w+PL8tCBULex3mLxyQ5IzXazosIII alEWXn45SnykoZYRCV6B8cmxuGCoEb3DO6yeh0GF0nbRUYs1mLir1xqEP25qoauRD9+6 JnQBe2dnMpIUmFo5MW7S/w48tIKwb18WnrUpBBqNj4pJ7sY98PBAhxz5xWWK/EG3IcYx N0WR2jkd1YpR1b4OGjTGwKch6Zkr+TeRikvbaZMeFY0/SafD+hFVUKmmfy8RTqkBgEMj eKqw== 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=+czq6miQ0mBDch3gmdYhKC0gx38ZSOssz4z8cIyVzrw=; fh=ITBRcZD8GJGVyZo9Ga7lvH/ZH1vTl7cNncr0kGhpoaQ=; b=QeMfYxgbO64AWV2BdwaseyDcMg/1waxJgNMlsv3ZIk7O3pnnDVQNiC7Ztu/WhIY9Te KzKO6HG8EPEC+0LQnmSfk2KJPxABXNX4IMq9fNBoZC+Bd97nZ/EZa9O8U0/6Vd0Ftxdu MWgyeZBoUMaFjE9ZHNxF8CcYndq0hhUXEOW0jvWgnhantAXHpg/JveGZfYagF25Ewf82 dI/oBVbkR+Ns9EeE1yApGH9066P3mxh9c8lyKp5nblMUF8Qhmyl2fBZY1da2Y4eKC+oR dXWHEC6JDHGbayGgzQhkHy5IqBfxCHvjpDTxMlqIpTB4hCioHLLb/Eps/GV7ihgwr3yo 7O/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Xel0quGw; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q9-20020a631f49000000b0053eee173733si4289375pgm.227.2023.06.25.20.42.46; Sun, 25 Jun 2023 20:43:01 -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=Xel0quGw; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229750AbjFZDKH (ORCPT + 99 others); Sun, 25 Jun 2023 23:10:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231194AbjFZDJ4 (ORCPT ); Sun, 25 Jun 2023 23:09:56 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BACF2189; Sun, 25 Jun 2023 20:09: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 4QqCWP188lz4wb0; Mon, 26 Jun 2023 13:09:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687748994; bh=+czq6miQ0mBDch3gmdYhKC0gx38ZSOssz4z8cIyVzrw=; h=Date:From:To:Cc:Subject:From; b=Xel0quGwLJn+HtPTqGPfqsT5vMdJ+W6r13r0GJewXUxdBj/nXt2igRHUq0lbdRr/i KJc2p2poDtGL0FBEGdwzPgztVomdhwc/dV4pcIzRPJykQCzRMceZaZTWoYuwwjSH1O 9BB66rHCEL25ZhIe6jvt/8S2MtW8mmNBwR27hxpGiSUF1FuY+y7Alvx9YVUE22/bHr MZoHu13Ipdxti2iZC7hZpAAaj2gXDye5ORqpE+ci2O3k0UoD5yRgkJUcuxjwCj4hWG t2ze96Ja/JB1DmyX4bv3UM+SGkY5zve0uefAkBHl2AFoZfOyQ6gBMQQrIRWPrbzkpV R5uNFYJO2CyHA== Date: Mon, 26 Jun 2023 13:09:51 +1000 From: Stephen Rothwell To: Jens Axboe , Theodore Ts'o Cc: Christoph Hellwig , Jan Kara , Linux Kernel Mailing List , Linux Next Mailing List , Zhihao Cheng Subject: linux-next: manual merge of the block tree with the ext4 tree Message-ID: <20230626130951.54c4254a@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,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1769735173072083800?= X-GMAIL-MSGID: =?utf-8?q?1769735173072083800?= Hi all, Today's linux-next merge of the block tree got a conflict in: fs/ext4/super.c between commit: ffea255f4052 ("ext4: Fix reusing stale buffer heads from last failed mounting") from the ext4 tree and commits: 2736e8eeb0cc ("block: use the holder as indication for exclusive opens") a42fb5a75ccc ("ext4: Fix warning in blkdev_put()") from the block 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/ext4/super.c index b3819e70093e,64342adcd679..000000000000 --- a/fs/ext4/super.c