From: Jonathan Corbet <corbet@lwn.net>
To: Mark Brown <broonie@kernel.org>
Cc: наб <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
Date: Tue, 27 Sep 2022 13:25:23 -0600 [thread overview]
Message-ID: <87czbgoc0s.fsf@meer.lwn.net> (raw)
In-Reply-To: <YzI/3MjHgbXFHoHG@sirena.org.uk>
Mark Brown <broonie@kernel.org> writes:
> On Mon, Sep 26, 2022 at 04:54:45PM -0600, Jonathan Corbet wrote:
>> наб <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.
OK, I have dropped the conflicting patch. Manfred, if there are changes
there that still need to get in, please resubmit that part and we'll get
it done.
Thanks,
jon
next prev parent reply other threads:[~2022-09-27 19:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 21:06 linux-next: manual merge of the driver-core tree with the jc_docs tree broonie
2022-09-26 22:46 ` наб
2022-09-26 22:54 ` Jonathan Corbet
2022-09-27 0:12 ` Mark Brown
2022-09-27 19:25 ` Jonathan Corbet [this message]
[not found] ` <AS8PR10MB483537EF2530D92C3D5BFF9ABF5B9@AS8PR10MB4835.EURPRD10.PROD.OUTLOOK.COM>
2022-10-08 11:33 ` Manfred Spraul
2022-09-26 23:44 ` Mark Brown
2022-09-27 0:46 ` наб
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87czbgoc0s.fsf@meer.lwn.net \
--to=corbet@lwn.net \
--cc=broonie@kernel.org \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=manfred.spraul@de.bosch.com \
--cc=nabijaczleweli@nabijaczleweli.xyz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).