From patchwork Tue Jun 13 02:54:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 107038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp273282vqr; Mon, 12 Jun 2023 20:12:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6G3UglSSkDve1E9fRTWcd22UWYRSZ5xKaRR1ek9PDT0D9GubjJlRaTeF8N1cGafsny9m0O X-Received: by 2002:a17:907:6d17:b0:966:17b2:5b0b with SMTP id sa23-20020a1709076d1700b0096617b25b0bmr9955628ejc.49.1686625953310; Mon, 12 Jun 2023 20:12:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686625953; cv=none; d=google.com; s=arc-20160816; b=FPlOTvYus/uKoeHwPdI8vHEuDlQ8c78pshOrNPK7MMvcLM2jdY3Degj9ucVAKsR9Dv 4rGqNdkuokb299ps1ihmVadU0J/DMaaVwyNSdZmn5vWbkJk818woFO3COREJWz4YvXwN yLd3WFT536sv7qK9tjn3tKTOnJGyuz/5mQEB1SKbHn+k9VQrqc6ZL/3zJ2GP9m/STsdN qLFdGa1N+9LHImk5MTVtqAX9qDMoDntLsI9XYBNmFm0hXe/OODpej9nxC+Lx+5+t54f0 DcNhoEW1g6gVjAeg++pyQT+lbTA0ZITT88qa1IgIt3nnzHj4HvGRn9/WzzuLh0BnJF5P nesQ== 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=2iT5jXCclrnY2bEFfafzVRtJej6mnikqPMzQSHmL+Nk=; b=PUVa8142939PIIVPhl/gAoLgYClddbSFa0bjhEQxwmcHdhyf+NeRwfYQJ/VMCgnVbV C7bH1N8SfcTRqvWC8NA/MgNwzlY0P9p6DneLpZvyKTasZVB2Wc84HUKk2QNbKhThT7qt i1WdS3S2ccsolxSVX58IxSdgFNedZwJpW7lPWfOkkLz9/8+ozeIea/ux44/3svAGi8Lt vicT1jwcnK5yjOG4ht8ktsxwOlElNSM0hyhxdBCQ5poBF1JZru3PgRlPBwnQMPXChdIz I9plXij1f30NkZ+udRfkL3N+jV6om74D4V47PTWgY5HMYQ2IWkq5xqU5+HZ42oIBRI7r 1NQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ERBA2vZl; 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 rh7-20020a17090720e700b00977d2cbd3d0si4695461ejb.596.2023.06.12.20.12.09; Mon, 12 Jun 2023 20:12:33 -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=ERBA2vZl; 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 S238558AbjFMCyl (ORCPT + 99 others); Mon, 12 Jun 2023 22:54:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232586AbjFMCyj (ORCPT ); Mon, 12 Jun 2023 22:54:39 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AF921989; Mon, 12 Jun 2023 19:54:12 -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 4QgCnG1WfPz4x4F; Tue, 13 Jun 2023 12:54:09 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686624851; bh=2iT5jXCclrnY2bEFfafzVRtJej6mnikqPMzQSHmL+Nk=; h=Date:From:To:Cc:Subject:From; b=ERBA2vZl3YN9L8feZVlb5MvIGKYCMG+vCM+7QKQ1NfnOOc6rtW3olZYHGMxmjyzHa Oj9dB64G10Uo+CKTaON6eiqLeNLL5zcYM7vxpGRCt8aJVtoAgPXsJ/auPgrFgW84iG cksBe56NfUp8ZtJnz/YJyRrjGGZi6BPZawITGyTMAy7Iys2G8PJFILtOhvu4+Kin6Z hfLm+cX7I0HsgC/q/nuo3GS4ku8fvZqJ6WeezEcndBfNR9298VljRcFcdSuCkCXPY1 FHbRin62HUuuocRlns6WioPvYNZn7Vp8/ztOttucgR7VW+3bKliHn6oMgbiM7U7FM1 vISXKc1gfvtGw== Date: Tue, 13 Jun 2023 12:54:08 +1000 From: Stephen Rothwell To: Jens Axboe , Theodore Ts'o Cc: Christoph Hellwig , 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: <20230613125408.7321db60@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, URIBL_BLOCKED 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?1768555496040182485?= X-GMAIL-MSGID: =?utf-8?q?1768555496040182485?= Hi all, Today's linux-next merge of the block tree got a conflict in: fs/ext4/super.c between commit: 63bc068f0d1a ("ext4: Fix reusing stale buffer heads from last failed mounting") from the ext4 tree and commit: 2736e8eeb0cc ("block: use the holder as indication for exclusive opens") 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,94a7b56ed876..000000000000 --- a/fs/ext4/super.c