From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 371D3329E67 for ; Fri, 30 Jan 2026 21:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769809847; cv=none; b=Noqs4yn14fuxM8BI13gTj+Yo3Rsy8HsjN+SXtuhP+/97ySABvAp74DCr34b1R00stq3utZjqwAX+SBf3JY4UlxazfEOkkbfZZ7wNb/dRVOjGgVNZr43SBsbckHEhloOPoJCniFALyorxK2jZZrt8EvBWxdNqfN4bT7kh6uzGz/s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769809847; c=relaxed/simple; bh=TsMsJILKN5IZIFtagkN45eiTeHpsm035umuII9ApRJc=; h=From:In-Reply-To:References:To:Cc:Subject:MIME-Version: Content-Type:Date:Message-ID; b=Thl0VrdKcTkfWjeBtokrIJqKXn+F87seaf5irpDk0GNyUnCiepwl8Vc97Knvoof8WzR0ENgME/7EPJHuiscPAiVuR1NLeekEyO+3IB+V4CpWwuAyeSoyLyV9/xbsjS1M2dXp8wusXhzGjKbTL6Eq60V5TvBU168l26IF3bNI+xA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=F1HPWGyV; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="F1HPWGyV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769809845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WOmEr/K5yvfEJ/3Svi7ggBB7bbWHsPKECBhFjeeSJg8=; b=F1HPWGyVzhqbuV1P+3z7ajNOpKryjamzfGwRmZjODtQ7TTuRqnH5C+tVBSnR5Lb1e2e+mz PO9sX3FJM4N3Z9tkf8wh62f7mKmvHqdFKRqKMZl9Oy2nOhJ3ZrpCtBjt+wXYoyeqrb5Q9q 2S0ZAeokV62zbLqRQgQkg0d9JG3PeGI= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-59-JwHQvZ3NMd6kPHjC7n5edw-1; Fri, 30 Jan 2026 16:50:41 -0500 X-MC-Unique: JwHQvZ3NMd6kPHjC7n5edw-1 X-Mimecast-MFC-AGG-ID: JwHQvZ3NMd6kPHjC7n5edw_1769809840 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D8D7A1800378; Fri, 30 Jan 2026 21:50:39 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.44.33.164]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1BFBC180097D; Fri, 30 Jan 2026 21:50:37 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <33417587-10b3-4cea-ad5f-595af16174fb@sirena.org.uk> References: <33417587-10b3-4cea-ad5f-595af16174fb@sirena.org.uk> To: Mark Brown Cc: dhowells@redhat.com, Sami Tolvanen , Linux Kernel Mailing List , Linux Next Mailing List , Petr Pavlu Subject: Re: linux-next: manual merge of the keys-next tree with the modules tree Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <2280989.1769809836.1@warthog.procyon.org.uk> Date: Fri, 30 Jan 2026 21:50:36 +0000 Message-ID: <2280990.1769809836@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Mark Brown 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. David