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;
Date:   Thu, 11 May 2023 11:07:50 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Christian Brauner <christian@brauner.io>,
        Seth Forshee <sforshee@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
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: <b5c0b1b9-9896-2637-458b-ca1003ba7d74@kernel.dk>
References: <20230510105543.165f102b@canb.auug.org.au>
        <b5c0b1b9-9896-2637-458b-ca1003ba7d74@kernel.dk>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/zp6IJU1/hKF4ilVOf8xCEZ0";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--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 <axboe@kernel.dk> 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--