From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753210AbcBGAn6 (ORCPT ); Sat, 6 Feb 2016 19:43:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52960 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948AbcBGAn4 convert rfc822-to-8bit (ORCPT ); Sat, 6 Feb 2016 19:43:56 -0500 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <20160206142705.GA23978@gondor.apana.org.au> References: <20160206142705.GA23978@gondor.apana.org.au> <20160206074731.GF22220@gondor.apana.org.au> <20160202180848.2887.9937.stgit@tstruk-mobl1> <11215.1454752821@warthog.procyon.org.uk> To: Herbert Xu Cc: dhowells@redhat.com, jmorris@namei.org, Tadeusz Struk , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, linux-crypto@vger.kernel.org, zohar@linux.vnet.ibm.com Subject: Re: [PATCH v5 0/3] crypto: KEYS: convert public key to akcipher api MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Date: Sun, 07 Feb 2016 00:43:53 +0000 Message-ID: <12277.1454805833@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Herbert Xu 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