From: Herbert Xu Subject: Crypto Fixes for 3.4 Date: Thu, 22 Mar 2012 12:20:46 +1100 Message-ID: <20120322012046.GA8854@gondor.apana.org.au> References: <20100603100550.GA30681@gondor.apana.org.au> <20100716022648.GA28219@gondor.apana.org.au> <20100722055043.GA25689@gondor.apana.org.au> <20100903060055.GA28915@gondor.apana.org.au> <20100903110722.GA31826@gondor.apana.org.au> <20101215115035.GA25248@gondor.apana.org.au> <20110216053911.GA10999@gondor.apana.org.au> <20110328071322.GA6569@gondor.apana.org.au> <20110629235153.GA16559@gondor.apana.org.au> <20120126024342.GA12492@gondor.apana.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: Linus Torvalds , "David S. Miller" , Linux Kernel Mailing List , Linux Crypto Mailing List Return-path: Received: from sting.hengli.com.au ([178.18.18.71]:55783 "EHLO fornost.hengli.com.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755988Ab2CVBUx (ORCPT ); Wed, 21 Mar 2012 21:20:53 -0400 Content-Disposition: inline In-Reply-To: <20120126024342.GA12492@gondor.apana.org.au> Sender: linux-crypto-owner@vger.kernel.org List-ID: Hi Linus: This push fixes a build problem where two crypto modules both try to export the same symbols (which shouldn't have been exported in the first place). Please pull from git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git or master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git Jussi Kivilinna (2): crypto: camellia-x86_64 - module init/exit functions should be static crypto: twofish-x86_64-3way - module init/exit functions should be static arch/x86/crypto/camellia_glue.c | 4 ++-- arch/x86/crypto/twofish_glue_3way.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Thanks, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt