Herbert Xu <herb...@gondor.apana.org.au> 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?
Ummm. I did say I'd take it on top of my patches. How did you take it? Did you merge Tadeusz's branch? If so, I can probably merge it into mine also and git will Just Do The Right Thing™. David
