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;
From:   Jonathan Corbet <corbet@lwn.net>
To:     =?utf-8?B?0L3QsNCx?= <nabijaczleweli@nabijaczleweli.xyz>,
        broonie@kernel.org
Cc:     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
In-Reply-To: <20220926224621.47llaskp6mihi4dd@tarta.nabijaczleweli.xyz>
References: <20220926210631.657728-1-broonie@kernel.org>
 <20220926224621.47llaskp6mihi4dd@tarta.nabijaczleweli.xyz>
Date:   Mon, 26 Sep 2022 16:54:45 -0600
Message-ID: <878rm5rbka.fsf@meer.lwn.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

=D0=BD=D0=B0=D0=B1 <nabijaczleweli@nabijaczleweli.xyz> writes:

> Hi!
>
> On Mon, Sep 26, 2022 at 10:06:31PM +0100, broonie@kernel.org wrote:
>> Today's linux-next merge of the driver-core tree got a conflict in:
>>=20
>>   Documentation/process/magic-number.rst
>>=20
>> between commit:
>>=20
>>   32ba63d4b2e1a ("Doc update: Correct magic values from nbd protocol, V2=
")
>>=20
>> from the jc_docs tree and commits:
>>=20
>>   82805818898dd ("Documentation: NBD_REPLY_MAGIC isn't a magic number")
>>   bd5926220ffe0 ("nbd: remove define-only NBD_MAGIC, previously magic nu=
mber")
>>=20
>> from the driver-core tree (and probably more for context).
>
> If I'm reading the merge right (very much not a given!),
> it seems that the NBD_REPLY_MAGIC (and LO_MAGIC?) constant(s) survived:
> they both need to go for reasons listed in
>   bd5926220ffe0: LO_MAGIC doesn't exist
>   82805818898dd: NBD_REPLY_MAGIC is part of the line protocol,
>                  not a magic number=20
>
> 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?

Thanks,

jon