From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Eric Biggers <ebiggers@kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Theodore Ts'o <tytso@mit.edu>,
Bagas Sanjaya <bagasdotme@gmail.com>,
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 random tree with the jc_docs tree
Date: Fri, 22 Apr 2022 11:16:12 +0200 [thread overview]
Message-ID: <YmJyXEg6O5vxKYFO@zx2c4.com> (raw)
In-Reply-To: <YmJvKZcYMsypQRZJ@zx2c4.com>
Hey again,
On Fri, Apr 22, 2022 at 11:02:33AM +0200, Jason A. Donenfeld wrote:
> > Meanwhile, Jason, if you want to pick up the offending patches directly,
> > I can drop them from docs-next.
>
> Ah, I hadn't seen that other patch because it wasn't CC'd to me, but
> that makes sense since it was mostly a docs fix rather than a
> substantive technical change. Since we've now got both going on at once,
> I'll just take the docs one to make the conflict easier, so sure, drop
> it from your tree, and I'll apply it to mine.
Done, with the build conflicts fixed up. These are now in my tree:
- 3608cbde2518 ("Documentation: siphash: convert danger note to warning for HalfSipHash")
- 3addb633c82f ("Documentation: siphash: enclose HalfSipHash usage example in the literal block")
- 1ed2075e7202 ("Documentation: siphash: disambiguate HalfSipHash algorithm from hsiphash functions")
Jason
next prev parent reply other threads:[~2022-04-22 9:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-22 3:59 linux-next: manual merge of the random tree with the jc_docs tree Stephen Rothwell
2022-04-22 6:32 ` Eric Biggers
2022-04-22 7:21 ` Jonathan Corbet
2022-04-22 9:02 ` Jason A. Donenfeld
2022-04-22 9:16 ` Jason A. Donenfeld [this message]
2022-04-22 15:49 ` Jonathan Corbet
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=YmJyXEg6O5vxKYFO@zx2c4.com \
--to=jason@zx2c4.com \
--cc=bagasdotme@gmail.com \
--cc=corbet@lwn.net \
--cc=ebiggers@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tytso@mit.edu \
/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