Re: linux-next: manual merge of the keys-next tree with the modules tree

[Sami Tolvanen]

On Fri, Jan 30, 2026 at 10:12 AM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> On Fri, Jan 30, 2026 at 05:20:09PM +0000, Mark Brown wrote:
>
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
>
> Also needs this (or something):
>
> From 6d9a82fe703a084c1dc0d5a1d184bea787aa7d9a Mon Sep 17 00:00:00 2001
> From: Mark Brown <broonie@xxxxxxxxxx>
> Date: Fri, 30 Jan 2026 17:56:06 +0000
> Subject: [PATCH] keys: Merge fixup
>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
> ---
>  scripts/sign-file.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/scripts/sign-file.c b/scripts/sign-file.c
> index a65c3e0c40b66..ef8a33ba9c529 100644
> --- a/scripts/sign-file.c
> +++ b/scripts/sign-file.c
> @@ -206,6 +206,7 @@ int main(int argc, char **argv)
>         bool raw_sig = false;
>         unsigned char buf[4096];
>         unsigned long module_size, sig_size;
> +       unsigned int use_signed_attrs = PKCS7_NOATTR;

This should be initialized to CMS_NOATTR.

Sami