Part 4 of this patch does not apply to api-next for me:

bill@Ubuntu15:~/linaro/hongbo$ git am --reject ~/Mail/Incoming/Hongbo/4
Applying: linux-generic: sysinfo clean up for ARM
Checking patch platform/linux-generic/arch/arm/odp_sysinfo_parse.c...
error: platform/linux-generic/arch/arm/odp_sysinfo_parse.c: does not exist
in index
Checking patch platform/linux-generic/arch/arm/odp_sysinfo_parse.c...
Checking patch platform/linux-generic/arch/linux/odp_sysinfo_parse.c...
Applied patch platform/linux-generic/arch/arm/odp_sysinfo_parse.c cleanly.
Applied patch platform/linux-generic/arch/linux/odp_sysinfo_parse.c cleanly.
Patch failed at 0001 linux-generic: sysinfo clean up for ARM
The copy of the patch that failed is found in:
   /home/bill/linaro/hongbo/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


On Tue, Feb 2, 2016 at 4:32 AM, Maxim Uvarov <[email protected]>
wrote:

> Ping.
>
> This fixes have to be in 1.7.
>
> Trivial, but please one more review.
>
> Maxim.
>
> On 01/29/2016 14:30, [email protected] wrote:
>
>> From: Hongbo Zhang <[email protected]>
>>
>> This patch set does some architecture clean-ups for linux-generic
>> sysinfo codes.
>>
>> This patch set is based on my previous patch set
>> "separate ODP_CACHE_LINE_SIZE to arch files", so "API-NEXT" is uesed
>> although no API is touched.
>>
>> Hongbo Zhang (4):
>>    linux-generic: move CPU info dummy data to generic default file
>>    linux-generic: systemcpu(): use input parameter instead of global data
>>    linux-generic: use one uniform call systemcpu()
>>    linux-generic: sysinfo clean up for ARM
>>
>>   .../linux-generic/arch/arm/odp_sysinfo_parse.c     | 29 ++++++++++++-
>>   .../linux-generic/arch/linux/odp_sysinfo_parse.c   | 12 +++++-
>>   platform/linux-generic/odp_system_info.c           | 47
>> +++++-----------------
>>   3 files changed, 47 insertions(+), 41 deletions(-)
>>   mode change 120000 => 100644
>> platform/linux-generic/arch/arm/odp_sysinfo_parse.c
>>
>>
> _______________________________________________
> lng-odp mailing list
> [email protected]
> https://lists.linaro.org/mailman/listinfo/lng-odp
>
_______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp

Reply via email to