From: David Howells Subject: Re: [PATCH v5 0/3] crypto: KEYS: convert public key to akcipher api Date: Sat, 06 Feb 2016 10:00:21 +0000 Message-ID: <11215.1454752821@warthog.procyon.org.uk> References: <20160206074731.GF22220@gondor.apana.org.au> <20160202180848.2887.9937.stgit@tstruk-mobl1> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Cc: dhowells@redhat.com, Tadeusz Struk , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, linux-crypto@vger.kernel.org, zohar@linux.vnet.ibm.com To: Herbert Xu , jmorris@namei.org Return-path: In-Reply-To: <20160206074731.GF22220@gondor.apana.org.au> Content-ID: <11214.1454752821.1@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-crypto.vger.kernel.org Herbert Xu wrote: > Applied. Hmmm... That means that the crypto branch and the security branch are going to conflict. David