From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753638AbdDKHA6 (ORCPT ); Tue, 11 Apr 2017 03:00:58 -0400 Received: from conssluserg-04.nifty.com ([210.131.2.83]:57371 "EHLO conssluserg-04.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752398AbdDKHA4 (ORCPT ); Tue, 11 Apr 2017 03:00:56 -0400 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-04.nifty.com v3B70kfd023741 X-Nifty-SrcIP: [209.85.213.175] MIME-Version: 1.0 In-Reply-To: <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> <20170411064009.GA11311@gondor.apana.org.au> From: Masahiro Yamada Date: Tue, 11 Apr 2017 16:00:45 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: linux-next: manual merge of the crypto tree with the kbuild tree To: Herbert Xu Cc: Stephen Rothwell , Linux-Next Mailing List , Linux Kernel Mailing List , Nicolas Dichtel Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Herbert, 2017-04-11 15:40 GMT+09:00 Herbert Xu : > 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. > Ah, right. Commit 4473710df1f8 fixed the problem, but reverting the patch in kbuild will break the bisect'ability of the kbuild tree. I will consult people about how to handle this case. -- Best Regards Masahiro Yamada