On Sat, Feb 06, 2016 at 10:00:21AM +0000, David Howells 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? Cheers, -- Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
