From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F872C07E96 for ; Thu, 8 Jul 2021 12:52:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 807D461456 for ; Thu, 8 Jul 2021 12:52:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231654AbhGHMzH (ORCPT ); Thu, 8 Jul 2021 08:55:07 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:51297 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230433AbhGHMzG (ORCPT ); Thu, 8 Jul 2021 08:55:06 -0400 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 4GLGQt6BFkz9s5R; Thu, 8 Jul 2021 22:52:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1625748743; bh=S8ucLp7nedvIAiNyMX/aoAvCTHpW3Mv2oduRMPGocQw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=N2kqwd0kwaD3xi7U4djjpjnyMBWIErwGSqc+s3wLTFHu91RBPz4tJiiK0WLqBGHXF 8XzT9A0dvYFxJLKM8P/HIXCoywfGNo7lwo9j7CtRHgEWvZPVx2G6B1ZD0RuXst2Qnz oUf7EL70QbZF+d5Jh4vZCG22Vm8UNO4U3EUu1krnXsO2xSjy0VkoijqX0qHbhaVQH8 8dl2SdGBq8kmO5m9/ELMA4HWFgCsCOy8vJIMWQz5Uq1CWlo20nouIg/H2iTdt3to3g K2DGBppf6phZD2QPyJWNCOhIhHYZl45DbPyqwGMyCcFdwlPIzDyHIbAwez/0No4a5G qbW/IvTzFeAJw== Date: Thu, 8 Jul 2021 22:52:21 +1000 From: Stephen Rothwell To: Jan Kara Cc: Jaegeuk Kim , Linus Torvalds , Linux Kernel Mailing List , Linux F2FS Dev Mailing List Subject: Re: [GIT PULL] f2fs for 5.14-rc1 Message-ID: <20210708225221.30f1100b@canb.auug.org.au> In-Reply-To: <20210708095217.GA32434@quack2.suse.cz> References: <20210708094647.7c0d3060@canb.auug.org.au> <20210708095217.GA32434@quack2.suse.cz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/.o7QYyeDvI95PXfHejQuDb4"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/.o7QYyeDvI95PXfHejQuDb4 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Jan, On Thu, 8 Jul 2021 11:52:17 +0200 Jan Kara wrote: > > Whether that particular series causing the conflict will be merged by Lin= us > in this merge window is uncertain - Linus didn't like how filemap_fault() > unconditionally acquired the lock. I've created an optimization patch to = avoid > that but review is pending... At this point I'm leaning towards the varia= nt > that series won't go in during the merge window. In that case I'll > probably rebase on top of rc1 and force-push everything. No worries, thanks for the reply. --=20 Cheers, Stephen Rothwell --Sig_/.o7QYyeDvI95PXfHejQuDb4 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDm9QUACgkQAVBC80lX 0Gw65wf7BYY2Q+2LzBOx+CnC0fGEpBEXWBilTo/z5vdX9KxtDswQf3Xk4YDRcIsJ QjTiDAVneeytbS24VqMIXZShTjtodXt5UNX4PhutGlz0jTTU3am4+11YT+cSJd51 Z5+V8fsZPIdwFJ1F7JGByrmWgjYrcjjLzSvUVzL98YVqB20EXmPoPHumLpXH2VHp jLgFfrKtjsGdkcayDq/ofcAOssi0KP4rL5gtiVX7HvfCzZRmHTDcTHf1tANxz4aC L+jHIVwqPOdtbIKmWmr7RCNu5z7zlFJBe4ORwpDuvr/xWDZPP3jLxQ5F89RZ2BbU w6wqeHbAcG8FXeXFV+/wz08yZSs2UA== =BWRJ -----END PGP SIGNATURE----- --Sig_/.o7QYyeDvI95PXfHejQuDb4--