Hi Rusty,

Today's linux-next merge of the modules tree got a conflict in
kernel/modsign_pubkey.c between commit 84ecfd15f554 ("modsign: add symbol
prefix to certificate list") from Linus' tree and commit bb8f5966421d
("MODSIGN: Avoid using .incbin in C source") from the modules tree.

I fixed it up (I just used the modules tree version as it removed the
section of code modified by the former) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au