From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965458AbcCPGuc (ORCPT ); Wed, 16 Mar 2016 02:50:32 -0400 Received: from helcar.hengli.com.au ([209.40.204.226]:34020 "EHLO helcar.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934569AbcCPGub (ORCPT ); Wed, 16 Mar 2016 02:50:31 -0400 Date: Wed, 16 Mar 2016 14:49:53 +0800 From: Herbert Xu To: Stephen Rothwell Cc: Doug Ledford , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Faisal Latif Subject: Re: linux-next: build failure after merge of the rdma tree Message-ID: <20160316064953.GA28157@gondor.apana.org.au> References: <20160316121538.6d5a773b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160316121538.6d5a773b@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 16, 2016 at 12:15:38PM +1100, Stephen Rothwell wrote: > Hi Doug, > > After merging the rdma tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from drivers/infiniband/hw/i40iw/i40iw.h:57:0, > from drivers/infiniband/hw/i40iw/i40iw_cm.c:63: > drivers/infiniband/hw/i40iw/i40iw_osdep.h:175:12: warning: 'struct hash_desc' declared inside parameter list > u32 length, u32 value); > ^ > > And it went downhill badly after that. > > Caused by commit > > 896545098777 ("crypto: hash - Remove crypto_hash interface") > > from the crypto tree interacting with commits > > 786c6adb3a94 ("i40iw: add puda code") > 4e9042e647ff ("i40iw: add hw and utils files") > > (at least) from the rdma tree. > > Its a bit of a pain finding these conflicts now - it would have been > better a few weeks ago. > > For now, all I can do is to use the rdma tree from next-20160315 for > today. > > Herbert, any hints for Doug, Faisal? crypto_hash is obsolete. You should be using shash if your input is completely linear or ahash if you need SG lists. For an example of how you can do the conversion, have a look at commit 69110e3cedbb8aad1c70d91ed58a9f4f0ed9eec6 Author: Herbert Xu Date: Sun Jan 24 21:19:52 2016 +0800 iscsi-target: Use shash and ahash Cheers, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt