From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Suren Baghdasaryan <surenb@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mark Brown <broonie@kernel.org>
Subject: Re: linux-next: manual merge of the arm64 tree with the mm tree
Date: Wed, 20 Nov 2024 13:57:17 +1100 [thread overview]
Message-ID: <20241120135717.2be629ee@canb.auug.org.au> (raw)
In-Reply-To: <CAJuCfpGNKzBadFix9WpN-PQMr2Mwj1NjawzSk8ycBST9USKpcA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
Hi Suren,
On Tue, 19 Nov 2024 17:09:46 -0800 Suren Baghdasaryan <surenb@google.com> wrote:
>
> Let me try to manually apply it to Linus' ToT and will send a replacement patch.
Please don't. Andrew will tell Linus about the conflict (he has done,
I think) and Linus will just fix it up when he merges the mm-stable
tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-11-20 2:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-28 0:10 linux-next: manual merge of the arm64 tree with the mm tree Stephen Rothwell
2024-10-28 17:25 ` Catalin Marinas
2024-10-28 17:47 ` Suren Baghdasaryan
2024-11-20 1:01 ` Stephen Rothwell
2024-11-20 1:09 ` Suren Baghdasaryan
2024-11-20 1:43 ` Suren Baghdasaryan
2024-11-20 2:57 ` Stephen Rothwell [this message]
2024-11-20 3:18 ` Suren Baghdasaryan
-- strict thread matches above, loose matches on Subject: below --
2024-10-23 23:37 Stephen Rothwell
2024-10-24 8:14 ` Catalin Marinas
2024-11-20 0:58 ` 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=20241120135717.2be629ee@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=surenb@google.com \
--cc=will@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.