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:   Tue, 27 Sep 2022 01:12:12 +0100
From:   Mark Brown <broonie@kernel.org>
To:     Jonathan Corbet <corbet@lwn.net>
Cc:     =?utf-8?B?0L3QsNCx?= <nabijaczleweli@nabijaczleweli.xyz>,
        Greg KH <greg@kroah.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Manfred Spraul <manfred.spraul@de.bosch.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 jc_docs tree
Message-ID: <YzI/3MjHgbXFHoHG@sirena.org.uk>
References: <20220926210631.657728-1-broonie@kernel.org>
 <20220926224621.47llaskp6mihi4dd@tarta.nabijaczleweli.xyz>
 <878rm5rbka.fsf@meer.lwn.net>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="2xIGPcpkILOvyfyN"
Content-Disposition: inline
In-Reply-To: <878rm5rbka.fsf@meer.lwn.net>
Precedence: bulk


--2xIGPcpkILOvyfyN
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Sep 26, 2022 at 04:54:45PM -0600, Jonathan Corbet wrote:
> =D0=BD=D0=B0=D0=B1 <nabijaczleweli@nabijaczleweli.xyz> writes:

> > This also reveals that I missed NBD_REQUEST_MAGIC
> > (needs to go, same reason as NBD_REPLY_MAGIC)
> > in the first pass, but that's unrelated here.

> I've been trying to make sense of that merge myself.  Is the right
> solution that I should just drop 32ba63d4b2e1a ?  Manfred, thoughts on
> that?

That'd certainly be a viable option too.

--2xIGPcpkILOvyfyN
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmMyP9sACgkQJNaLcl1U
h9Dqfwf8DrT/gFo1CSOWg6xhBl30XSPHqZqYYSQ4lSxI4MdyrMaMzPd71vChA+RF
4iKb3kJmWMXLiojv20iWmNlp14K4uPpxjnoTym8EEy6wLhL3hYbQBM6rmnr3E7oW
uG5iLpWwfLLPNCcnbVos4gk4Oi0j/6iI8ABNYLHnTntM7ImifoofFGjgoN3/bdn6
XXHM6DjAAfNmYFk6gjxn8b+1N9vQhaQW6bVL2bxLUHeSV977ekXzYle5AJfvpTXL
F6hyHvBNo8QvDIbiVn2RvJ7P0+uiB/Bx9MLlV5csupKdoqP0Zb0Gb2Nxfkhl81OY
lKzT4b7jqZRnd3ndMmwrnJP31DGtFA==
=+UIy
-----END PGP SIGNATURE-----

--2xIGPcpkILOvyfyN--