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 for Android: free password hash cracker in your pocket

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

Message-ID: <aX4EzlBYkA8yDvq8@sirena.co.uk>
Date: Sat, 31 Jan 2026 13:34:06 +0000
From: Mark Brown <broonie@...nel.org>
To: David Howells <dhowells@...hat.com>
Cc: Sami Tolvanen <samitolvanen@...gle.com>,
	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 09:50:36PM +0000, David Howells wrote:
> Mark Brown <broonie@...nel.org> wrote:

> > > Thanks, Mark. David, I see the patches in keys-next were updated just
> > > a few hours ago. Would it make sense for you to rebase them on top of
> > > next-20260129? Petr's patch removed the use_signed_attrs variable, so
> > > we should ensure it's still initialized correctly. Otherwise the
> > > resolution looks trivial.

> > Please don't base anything on -next itself, that causes all kinds of
> > problems and clearly isn't what you should be sending to Linus.

> I was wondering if I should rebase on a merge between Eric's branch and Sami's
> branch and "pre-handle" the conflict.

That's not a problem for -next so long as neither of their branches get
rebased and they're OK with that.

Generally Linus prefers to do merges himself, though it's always a taste
thing what makes most sense and in this case it's more that your new
work is based on the merge of the two branches - they don't actually
conflict at all IIRC.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)