linux-kernel - linux-next: manual merge of the modules tree with Linus' 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Thu, 19 Dec 2013 13:51:03 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	James Solner <solner@...atel-lucent.com>,
	David Howells <dhowells@...hat.com>
Subject: linux-next: manual merge of the modules tree with Linus' tree

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@...b.auug.org.au

Content of type "application/pgp-signature" skipped