Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote: > > Hmmm... That means that the crypto branch and the security branch are going > > to conflict. > > I thought you were OK with it going in now as you said that you'll > fix it up later. Sorry for the misunderstanding. Do you want me to > revert? If you can back them out, I'll apply them to my keys-next branch. Unless James is willing to rebase security/next on top of your crypto branch? David -- 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
