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? -- Cheers, Stephen Rothwell -- 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