Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756438AbZALTTc (ORCPT ); Mon, 12 Jan 2009 14:19:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753644AbZALTTX (ORCPT ); Mon, 12 Jan 2009 14:19:23 -0500 Received: from e4.ny.us.ibm.com ([32.97.182.144]:60308 "EHLO e4.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753262AbZALTTW (ORCPT ); Mon, 12 Jan 2009 14:19:22 -0500 Subject: Re: linux-next: Tree for January 12 (cifs vs. staging) From: Dave Kleikamp To: Steve French Cc: Randy Dunlap , Stephen Rothwell , linux-next@vger.kernel.org, LKML , sfrench@samba.org, Greg KH In-Reply-To: <524f69650901121058g73c8022eif1d1bcca5c0e01fa@mail.gmail.com> References: <20090112154539.4857f533.sfr@canb.auug.org.au> <496B899E.7060605@oracle.com> <524f69650901121058g73c8022eif1d1bcca5c0e01fa@mail.gmail.com> Content-Type: text/plain Date: Mon, 12 Jan 2009 13:19:18 -0600 Message-Id: <1231787958.6383.18.camel@norville.austin.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.24.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1715 Lines: 48 On Mon, 2009-01-12 at 12:58 -0600, Steve French wrote: > There is not just the cifs md5 one (which has been around a long > time), but an md5_init (static) in crypto and the new one in rt. The > addition of the new one (rt md5_init) causes the build problem. It > would be nice if we could use the same md5 routines though ... last > time we checked the crypto one was not well suited for calculating > signatures as a network fs would do though. Is that due to the byte-swapping? Can the cifs and rt* drivers use the same code. rt28[67]0/common/md5.c are identical files. In fact those "common" directories should probably be combined into a single truly common directory. > On Mon, Jan 12, 2009 at 12:19 PM, Randy Dunlap wrote: > > Stephen Rothwell wrote: > >> Hi all, > >> > >> Some people took me at my word and so we have the 2.6.30 code starting to > >> trickle in already. > > > > > > > > When CIFS is built-in (=y) and staging/rt28[67]0 =y, there are multiple > > definitions of: > > > > build-r8250.out:(.text+0x1d8ad0): multiple definition of `MD5Init' > > build-r8250.out:(.text+0x1dbb30): multiple definition of `MD5Update' > > build-r8250.out:(.text+0x1db9b0): multiple definition of `MD5Final' > > > > all of which need to have more unique identifiers for their global > > symbols (e.g., rt28_md5_init, cifs_md5_init, foo, blah, bar). > > > > > > -- > > ~Randy > > > > > -- David Kleikamp IBM Linux Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/