On 10/2/2018 2:06 PM, Thomas Monjalon wrote:
> Hi,
>
> 26/09/2018 18:21, Igor Ryzhov:
>> Long time ago preallocation of memory for KNI was introduced in commit
>> 0c6bc8e. It was done because of lack of ability to free previously
>> allocated memzones, which led to memzone exhaustion. Currently memzones
>> can be freed and this patch uses this ability for dynamic KNI memory
>> allocation.
>>
>> Signed-off-by: Igor Ryzhov <[email protected]>
>
> The patch does not apply on master.
> Is there a dependency?
There should not be a conflict, following commit already in tree is causing the
conflict, I was resolving it myself when testing:
Commit e716b639856c ("kni: fix crash with null name")
Basically both do same thing:
<<<<<<< IN REPO
if (name == NULL || name[0] == '\0')
return NULL;
=======
if (!name || !name[0])
return NULL;
>>>>>>> PATCH
It seems Igor has a older version of the tree. It is OK to keep the check
existing in the repo.
