| 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
| ||
|
Message-ID: <20141110195912.324b90ed@canb.auug.org.au>
Date: Mon, 10 Nov 2014 19:59:12 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>,
Josh Triplett <josh@...htriplett.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Marian Chereji <marian.chereji@...escale.com>,
Catalina Mocanu <catalina.mocanu@...il.com>
Subject: linux-next: manual merge of the akpm-current tree with the tiny
tree
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
lib/Kconfig between commit 3a8aeefbd4e9 ("lib: halfmd4: Make halfmd4.c
optional") from the tiny tree and commit c7f379b518a3 ("lib: Add CRC64
ECMA module") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc lib/Kconfig
index b8c97f05140d,2faf7b2de5b3..000000000000
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -186,9 -180,13 +186,16 @@@ config CRC
when they need to do cyclic redundancy check according CRC8
algorithm. Module will be called crc8.
+ config CRC64_ECMA
+ tristate "CRC64 ECMA function"
+ help
+ This option provides CRC64 ECMA function. Drivers may select this
+ when they need to do cyclic redundancy check according to the CRC64
+ ECMA algorithm.
+
+config HALFMD4
+ bool
+
config AUDIT_GENERIC
bool
depends on AUDIT && !AUDIT_ARCH
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists