Faisal is out until 3/18. We will make the changes and send a patch shortly. Thanks Herbert for the pointers. Regards. -----Original Message----- From: linux-next-owner@xxxxxxxxxxxxxxx [mailto:linux-next-owner@xxxxxxxxxxxxxxx] On Behalf Of Doug Ledford Sent: Wednesday, March 16, 2016 2:03 PM To: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>; Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Latif, Faisal <faisal.latif@xxxxxxxxx> Subject: Re: linux-next: build failure after merge of the rdma tree On 3/16/2016 2:49 AM, Herbert Xu wrote: > 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 <herbert@xxxxxxxxxxxxxxxxxxx> > Date: Sun Jan 24 21:19:52 2016 +0800 > > iscsi-target: Use shash and ahash > > Cheers, > Pending an update from Intel on the i40iw driver, I have pulled it from my for-next area. This should not be a problem with tonight's merge. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
