[U-Boot] [RFC, PATCH v2 2/4] lib, rbtree: resync with Linux-3.14

Heiko Schocher hs at denx.de
Wed May 28 07:24:44 CEST 2014


Hello Tom, Marek,

Am 27.05.2014 16:21, schrieb Tom Rini:
> On Mon, May 26, 2014 at 09:05:47AM +0200, Marek Vasut wrote:
>> On Monday, May 26, 2014 at 07:32:22 AM, Heiko Schocher wrote:
>>> Hello Marek,
>>>
>>> Am 24.05.2014 12:30, schrieb Marek Vasut:
>>>> On Thursday, May 22, 2014 at 12:43:06 PM, Heiko Schocher wrote:
>>>>> resync with linux:
>>>>>
>>>>> commit 455c6fdbd219161bd09b1165f11699d6d73de11c
>>>>> Author: Linus Torvalds<torvalds at linux-foundation.org>
>>>>> Date:   Sun Mar 30 20:40:15 2014 -0700
>>>>>
>>>>>       Linux 3.14
>>>>>
>>>>> Needed for the MTD/UBI/UBIFS resync
>>>>>
>>>>> Signed-off-by: Heiko Schocher<hs at denx.de>
>>>>> Cc: Marek Vasut<marex at denx.de>
>>>>> Cc: Sergey Lapin<slapin at ossfans.org>
>>>>> Cc: Scott Wood<scottwood at freescale.com>
>>>>
>>>> Did you just copy the files over or did you change anything in them? If
>>>> you changed anything, I'd say that should go into some compat header so
>>>> there's a minimum amount of changes compared to the mainline linux code.
>>>
>>> Just copied the file from Linux, changed the license file header,
>>> and add:
>>>
>>> +#define __UBOOT__
>>>    #include<linux/rbtree_augmented.h>
>>> +#ifndef __UBOOT__
>>>    #include<linux/export.h>
>>> +#else
>>> +#include<ubi_uboot.h>
>>> +#endif
>>>
>>> so, that should be ok.
>>
>> Thanks for clarifying, I suppose that might need to be in the commit message
>> though , so once we decide to do resync again, we'd know what the code looked
>> like compared to 3.14 .
>
> Agreed, thanks.

Ok, fixed... but I want to wait for some testing results before posting
a "v3".

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


More information about the U-Boot mailing list