From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751840AbcBFKA0 (ORCPT ); Sat, 6 Feb 2016 05:00:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51251 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750808AbcBFKAY (ORCPT ); Sat, 6 Feb 2016 05:00:24 -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: <20160206074731.GF22220@gondor.apana.org.au> References: <20160206074731.GF22220@gondor.apana.org.au> <20160202180848.2887.9937.stgit@tstruk-mobl1> To: Herbert Xu , jmorris@namei.org 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 Subject: Re: [PATCH v5 0/3] crypto: KEYS: convert public key to akcipher api MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <11214.1454752821.1@warthog.procyon.org.uk> Date: Sat, 06 Feb 2016 10:00:21 +0000 Message-ID: <11215.1454752821@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Herbert Xu wrote: > Applied. Hmmm... That means that the crypto branch and the security branch are going to conflict. David