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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DB8AC77B7C for ; Thu, 11 May 2023 01:08:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236619AbjEKBIA (ORCPT ); Wed, 10 May 2023 21:08:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236569AbjEKBH7 (ORCPT ); Wed, 10 May 2023 21:07:59 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38C1335A6; Wed, 10 May 2023 18:07:54 -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 4QGtzr2gb8z4x41; Thu, 11 May 2023 11:07:51 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1683767272; bh=XZSZUAZVLj2+UzRacgu3j7yyCTBTrxNnC4byOTcfx0o=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=t1ooUHYsdcB+LhPqR7Ug9oT/QFkaKAZlk7iODnk/EM6CggoUdkTvplyYKWUOd8E2U ESLTA6sQgNCX+vzIiMIBQp2zGTuwUKUqW9E2WYOyQ68AjbDoIhlfnTZ7dIKmBSNjwz pa1ER/u0xqv5M4S2WuaWIcWEcpUY9rS9pIxwYdd2rWjnV4tHKI9iVteZhtX/D18H+n /SEEh7TD/ORjf1hWvWTj6QE8H03jQ7XJQ8In2PxCeM36828bTaeQq6aWjwAKRUiTjN uj5gzR1EVP8SVYw8Od6ROGd33vx+D9jh33jVFi4TOsP201Wf7CQYu8HPO9HAEcRx5s lnd5vRQOku91A== Date: Thu, 11 May 2023 11:07:50 +1000 From: Stephen Rothwell To: Jens Axboe Cc: Christian Brauner , Seth Forshee , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the block tree with the vfs-idmapping tree Message-ID: <20230511110750.76a33556@canb.auug.org.au> In-Reply-To: References: <20230510105543.165f102b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/zp6IJU1/hKF4ilVOf8xCEZ0"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/zp6IJU1/hKF4ilVOf8xCEZ0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Jens, On Wed, 10 May 2023 06:48:39 -0600 Jens Axboe wrote: > > Yes, since Linus didn't like the original approach, it was redone > and that particular patch was originally forgotten and then redone > without the 'nonblock' variable. So you should just ignore the > old version, and Christian should just drop that branch from his > for-next tree as it's dead. That appears to have been done now, thanks. --=20 Cheers, Stephen Rothwell --Sig_/zp6IJU1/hKF4ilVOf8xCEZ0 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmRcP+cACgkQAVBC80lX 0Gy3Kwf+K4TyZ3emIIjnNaQ4YcxjGKGUkUqZx9rUwUaghOF1di44YpcUoqXOJMl2 OUHbvrrJ4lFq+dn/1EgrrC6D2JkaQo6ukW5Qy1hb6KLXRshtXLdmDlL1JoVXgHMR Gtl7RwXLDODiQMjDwZg5/DX+2rIkSpo71fV8EDn9TOzAH/6PgKn7SjYFrHjNJi6q +MRL4dknOujdwrvuee4/yewEJKp01h5Px/OgZuZFHhmT2i/nK+96xx6hlAmDHXxZ nM8+5D57peLheum2PReS6SVegMeoSsoz7dCAW1r5qmLDo0JC6jDsfPgybhwvfbi1 pf7HQve14XEaAKXE/1ZBZZs/UcFVxA== =BgHY -----END PGP SIGNATURE----- --Sig_/zp6IJU1/hKF4ilVOf8xCEZ0--