linux-kernel - Re: linux-next: manual merge of the tip 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250107081452.4294c7fd@canb.auug.org.au>
Date: Tue, 7 Jan 2025 08:14:52 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Suren Baghdasaryan <surenb@...gle.com>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Andrew Morton <akpm@...ux-foundation.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the mm tree

Hi Suren,

On Mon, 6 Jan 2025 12:21:14 -0800 Suren Baghdasaryan <surenb@...gle.com> wrote:
>
> On Sun, Jan 5, 2025 at 7:09 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > I got 2 more conflicts today due to the duplicate patch above.  
> 
> Have you been able to resolve the conflicts? Can I help with that?

I just use the version from the mm tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped