From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753578AbdDKGkW (ORCPT ); Tue, 11 Apr 2017 02:40:22 -0400 Received: from orcrist.hmeau.com ([104.223.48.154]:44750 "EHLO deadmen.hmeau.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752181AbdDKGkV (ORCPT ); Tue, 11 Apr 2017 02:40:21 -0400 Date: Tue, 11 Apr 2017 14:40:09 +0800 From: Herbert Xu To: Masahiro Yamada Cc: Stephen Rothwell , Linux-Next Mailing List , Linux Kernel Mailing List , Nicolas Dichtel Subject: Re: linux-next: manual merge of the crypto tree with the kbuild tree Message-ID: <20170411064009.GA11311@gondor.apana.org.au> References: <20170411102119.102f4675@canb.auug.org.au> <20170411024215.GA10664@gondor.apana.org.au> <20170411150250.49996951@canb.auug.org.au> <20170411051228.GA10951@gondor.apana.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 11, 2017 at 03:34:43PM +0900, Masahiro Yamada wrote: > Hi Herbert, > > > 2017-04-11 14:12 GMT+09:00 Herbert Xu : > > On Tue, Apr 11, 2017 at 03:02:50PM +1000, Stephen Rothwell wrote: > >> > >> So basically we need CRYPTO_MAX_ALG_NAME to be 64 in the exported > >> header but 128 in the kernel header? In which case the kbuild patch > >> needs to be changed not removed. Or the merge resolution needs to be > >> cleverer. > > > > Actually the kbuild patch just needs to be reverted. We should > > not export CRYPTO_MAX_ALG_NAME at all. Each user-space interface > > that uses it already has its own limit and should not refer to the > > in-kernel value. > > CRYPTO_MAX_ALG_NAME is referenced from > include/uapi/linux/cryptouser.h > > If you exporting CRYPTO_MAX_ALG_NAME is wrong, > please move cryptouser.h out of the include/uapi directory. It doesn't reference it anymore in the latest cryptodev tree. So please revert the patch from the kbuild tree. Thanks, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt