Re: linux-next: manual merge of the arm64 tree with the mm tree
From: Suren Baghdasaryan
Date: Tue Nov 19 2024 - 22:18:48 EST
On Tue, Nov 19, 2024 at 6:57 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi Suren,
>
> On Tue, 19 Nov 2024 17:09:46 -0800 Suren Baghdasaryan <surenb@xxxxxxxxxx> 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.
Sounds good.
I attached the promised patch in my previous reply but I guess it
won't be needed.
>
> --
> Cheers,
> Stephen Rothwell