Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 15 Dec 2020 08:43:00 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>
Cc:     Jens Axboe <axboe@kernel.dk>, David Sterba <dsterba@suse.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        Naohiro Aota <naohiro.aota@wdc.com>,
        Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Message-ID: <20201215084300.3543c433@canb.auug.org.au>
In-Reply-To: <20201214213612.GS6430@suse.cz>
References: <20201202150149.42543862@canb.auug.org.au>
        <20201215070956.6852e939@canb.auug.org.au>
        <25c43226-f937-0866-9c0b-46867bd04cc7@kernel.dk>
        <20201214213612.GS6430@suse.cz>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/yP56w+C5xgj2Oxokg8e0qTf";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/yP56w+C5xgj2Oxokg8e0qTf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi David,

On Mon, 14 Dec 2020 22:36:12 +0100 David Sterba <dsterba@suse.cz> wrote:
>
> On Mon, Dec 14, 2020 at 01:12:46PM -0700, Jens Axboe wrote:
> > On 12/14/20 1:09 PM, Stephen Rothwell wrote: =20
> > > Just a reminder that I am still applying the above merge fix. =20
> >=20
> > I sent in my core changes, but they haven't been pulled yet. So I guess
> > we're dealing with a timing situation... David, did you send in the btr=
fs
> > pull yet? =20
>=20
> Yes
> https://lore.kernel.org/lkml/cover.1607955523.git.dsterba@suse.com/

I would expect you *both* to at least mention this conflict to Linus ...

--=20
Cheers,
Stephen Rothwell

--Sig_/yP56w+C5xgj2Oxokg8e0qTf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/X3GQACgkQAVBC80lX
0GwUOAf7BCupZhrH2m2TJVGAUKCPwPHu4YXNRd6qZwz5TD6ZnwIh9coLFVzi8DaO
ReDNKTw1vJDUK8x5Aa+J4AWvsRIZehVTjX1b7l0TMizYHLL/6xR+GUEBauaIUjmE
z4T/vheB0eP+hfqvOdOhAe6YKoODs9ShXzQyHZNPPaG6YY91qjhwLYVmqE3HpLdl
ScOH8T8PvuafJMbKaJoDGUHI5Tn39NiP4poo06mKQzD0ssAkm0YRrTklQnCjUe8n
bpM2h0G+n7vuq3il6uMCRtciu0Z5pNUuCrbv3fWrZqPxAGEBWvEITMb4lYcx4CA5
nTEUUH3aSi40uo3kCrZ5v9R1XlslJQ==
=A+gw
-----END PGP SIGNATURE-----

--Sig_/yP56w+C5xgj2Oxokg8e0qTf--