Re: linux-next: manual merge of the crypto tree with the kbuild tree

[Masahiro Yamada]

Hi Herbert,


2017-04-11 15:40 GMT+09:00 Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>:
> 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 <herbert@xxxxxxxxxxxxxxxxxxx>:
>> > 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