From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: torvalds@linux-foundation.org,
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 mm-stable tree
Date: Wed, 24 Jul 2024 03:34:15 +0200 [thread overview]
Message-ID: <ZqBaF-HJhT7g9Uov@zx2c4.com> (raw)
In-Reply-To: <20240724091554.497bfed4@canb.auug.org.au>
Hi Stephen,
On Wed, Jul 24, 2024 at 09:15:54AM +1000, Stephen Rothwell wrote:
> This is now a conflict between the random tree and Linus' tree.
Not too big of a deal, I don't think; I'm just waiting on Linus to pull
the tag I sent last week. Andrew only sent mm this weekend, so I assume
pulling mine is slated for sometime soon after, now that Linus has
pulled the mm patches. So these conflicts should disappear shortly.
Regards,
Jason
next prev parent reply other threads:[~2024-07-24 1:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 7:40 linux-next: manual merge of the random tree with the mm-stable tree Stephen Rothwell
2024-07-23 23:15 ` Stephen Rothwell
2024-07-24 1:34 ` Jason A. Donenfeld [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-09 7:43 Stephen Rothwell
2024-07-23 23:16 ` Stephen Rothwell
2024-07-02 6:40 Stephen Rothwell
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=ZqBaF-HJhT7g9Uov@zx2c4.com \
--to=jason@zx2c4.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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