Hi Herbert,
On Mon, 2016-02-08 at 13:58 +0000, David Howells wrote:
Herbert Xu [off-list ref] wrote:
quoted
quoted
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?
Could we upstream these patches via James' tree? If you re-base these
patches on top of the James' security-next branch and send him a pull
request, we can then base on our patches on top of them.
Mimi