Hi Rusty,
Today's linux-next merge of the modules tree got a conflict in Documentation/module-signing.txt between commit 3cafea307642 ("Add Documentation/module-signing.txt file") from the tree and commit 160e01aca3da ("Add Documentation/module-signing.txt file") from the modules tree.
I fixed it up (I arbitrarily chose the version from Linus' tree) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpmYBa3tu6UI.pgp
Description: PGP signature
