linux-kernel - Re: linux-next: manual merge of the keys-next tree with the modules 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: <CABCJKufJFgnDAuK+n37rha6L9OZugyviVJNrZOCsSnAckHp1ag@mail.gmail.com>
Date: Fri, 30 Jan 2026 14:59:50 -0800
From: Sami Tolvanen <samitolvanen@...gle.com>
To: David Howells <dhowells@...hat.com>
Cc: Mark Brown <broonie@...nel.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Petr Pavlu <petr.pavlu@...e.com>
Subject: Re: linux-next: manual merge of the keys-next tree with the modules tree

On Fri, Jan 30, 2026 at 1:57 PM David Howells <dhowells@...hat.com> wrote:
>
> Sami Tolvanen <samitolvanen@...gle.com> wrote:
>
> > > Wouldn't that mean having to rebase before sending to Linus?
> >
> > Do you plan to send these to Linus for 7.0-rc1?
>
> Yes, hopefully.

Ah, OK. I initially thought these might not be for the next release
yet. In that case, it's probably just best to include the suggested
resolution in the pull request and let Linus handle the conflict.
Mark's changes looked correct to me.

Sami