linux-kernel - Re: linux-next: manual merge of the arm64 tree with the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAJuCfpH5GyeqZeao+Muzi3cAgVUKjkzkxBR-GqLF3huw1b-ZEw@mail.gmail.com>
Date: Tue, 19 Nov 2024 19:18:24 -0800
From: Suren Baghdasaryan <surenb@...gle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Andrew Morton <akpm@...ux-foundation.org>, Catalin Marinas <catalin.marinas@....com>, 
	Will Deacon <will@...nel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Mark Brown <broonie@...nel.org>
Subject: Re: linux-next: manual merge of the arm64 tree with the mm tree

On Tue, Nov 19, 2024 at 6:57 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi Suren,
>
> On Tue, 19 Nov 2024 17:09:46 -0800 Suren Baghdasaryan <surenb@...gle.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.

Sounds good.
I attached the promised patch in my previous reply but I guess it
won't be needed.

>
> --
> Cheers,
> Stephen Rothwell