On Thu, Mar 29, 2012 at 01:46:26PM +0800, Herbert Xu wrote: > On Thu, Mar 29, 2012 at 07:45:04AM +0200, Steffen Klassert wrote: > > On Mon, Mar 26, 2012 at 09:28:27AM +0200, Steffen Klassert wrote: > > > + > > > return netlink_dump_start(crypto_nlsk, skb, nlh, > > > - link->dump, link->done, 0); > > > + link->dump, link->done, dump_alloc); > > > > I've just noticed that the interface to netlink_dump_start() changed in > > the mainline (with commit 80d326fab534a5380e8f6e509a0b9076655a9670), so > > this will cause a conflict. The crypto-2.6 tree is way behind the mainline > > (v3.2 + some patches). Could you please update the crypto-2.6 tree so that > > I can respin this patch? > > > As long as your patch is against mainline it should be fine. I will > rebase cryptodev before applying any patches for the next release. > Ok, so I'll respin this one to the mainline and resend. Anyway, would be nice to see this fix in v3.4. -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html