Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8488C678D5 for ; Wed, 8 Mar 2023 00:46:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229904AbjCHAqp (ORCPT ); Tue, 7 Mar 2023 19:46:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229760AbjCHAql (ORCPT ); Tue, 7 Mar 2023 19:46:41 -0500 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10045A90A3 for ; Tue, 7 Mar 2023 16:46:33 -0800 (PST) Received: from cwcc.thunk.org (pool-173-48-120-46.bstnma.fios.verizon.net [173.48.120.46]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 3280jgfZ017097 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 7 Mar 2023 19:45:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mit.edu; s=outgoing; t=1678236344; bh=ZKmLc4Nwlc/lt6Y5Zz64jqgEPqgCmkt/KL2+cqYMWwU=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=ga9+PNNF3B2/qdJ/GoYNAYOq0hSAaMUFm5VMvGiUlMFigubXyEFf3/rbeU434sZ/D QtGUDBl19HPhGy9RjJtvRpppu5broucS0oGOOlBs2ntbRMhmt7iNoqUdQVCsjKWJFn 8w4ViaSJCp9Ee23bscKqEIledTx8lkpEuSCZr01/fSwDlCbCRFz2EeGjvmdy9qafyS BoHphBQporm15skq2LkXwlUJzpkw9IqpaO/lgrQdks8F1IbPMMHsmfjnP4PyNXyTy2 cn40W1JEUNBwyhI6DGLaAhZCgmwJRu5+kOIE2z4vHXAdi6nvRQi+LbqPsZXvLlo9DX m2YQ9TBTtUMgw== Received: by cwcc.thunk.org (Postfix, from userid 15806) id 3615715C3441; Tue, 7 Mar 2023 19:45:42 -0500 (EST) Date: Tue, 7 Mar 2023 19:45:42 -0500 From: "Theodore Ts'o" To: Stephen Rothwell Cc: Jan Kara , Bagas Sanjaya , Linus Torvalds , Linux Kernel Mailing List , Andrew Morton , Matthew Wilcox , Linux Next Mailing List , ext4 Development Subject: Re: The state of ext4 tree merging (was Re: Linux 6.3-rc1) Message-ID: <20230308004542.GA1867364@mit.edu> References: <20230306124134.hmeuvjhihs4ubpmz@quack3> <20230307090203.56c41488@oak.ozlabs.ibm.com> <20230307162137.GB960946@mit.edu> <20230308074431.21c32d58@oak.ozlabs.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230308074431.21c32d58@oak.ozlabs.ibm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 08, 2023 at 07:45:13AM +1100, Stephen Rothwell wrote: > > Did you forget to push the dev branch out? The version I have (and still see on git.kernel.org) has commit > > 2c2dec1e86cc ("ext4: fix incorrect options show of original mount_opt and extend mount_opt2") > > at its head, but what you sent to Linus has commit > > e3645d72f886 ("ext4: fix incorrect options show of original mount_opt and extend mount_opt2") > > at its head. Ah, sorry. I had pushed the tag, but not the branch. My bad. Anyway, fixed. - Ted