[U-Boot] [PATCH v4 0/3] mtd, ubi, ubifs: resync with Linux-3.14

Heiko Schocher
2014-06-25T04:50:00Z

Hello Tom,

Am 24.06.2014 16:39, schrieb Tom Rini:
> On Tue, Jun 24, 2014 at 06:48:27AM +0200, Heiko Schocher wrote:
>> Hello Tom,
>>
>> Am 23.06.2014 17:05, schrieb Tom Rini:
>>> On Sun, Jun 22, 2014 at 09:36:43AM +0200, Wolfgang Denk wrote:
>>>> Dear Heiko,
>>>>
>>>> In message<53A67ED9.2090705@denx.de> you wrote:
[...]
>>> is already out, lets do (as part of testing our theories out), a follow
>>> up patch to sync up with v3.15. And finally, I think we need, in order
>>> to keep this pain point down, sync per kernel release.
>>
>> Ok, I had prepared a v5, posting it soon.
>>
>> I try to do also to prepare a seperate sync with v3.15 patch, but give
>> me some time ... also I found a bug in current v3.16-rc1 kernel, using
>> ubi fastmap, see:
>>
>> "UBI: fix rb_tree node comparison in add_map commit buggy?"
>> http://lists.infradead.org/pipermail/linux-mtd/2014-June/054348.html
>>
>> So current v3.16-rc1 kernel could not attach a ubi volume using
>> ubi fastmap and created with a kernel not having commit
>> 604b592e6fd3c98f21435e1181ba7723ffc24715 applied ... which is
>> the case for v3.14 ... with my fixup, a v3.16-rc1 kernel could
>> again attach a v3.14 kernel or U-Boot (with my v3.14 sync patches
>> applied) created ubi volume ...
>>
>> Maybe we wait with the sync, until this is sorted out?
>
> Yes, that's fine. Perhaps we'll end up with a sync to v3.14 series, a
> v3.15 on top of it, and then backporting your bugfix patch(es) on top of
> that.

Ok, so let us bring in the v3.14 sync in the next merge window. I try
to do some more tests with it ...

I did a fast sync with v3.15, compiled for arm, mips and powerpc
but I have to test this, and this will takes some time, I currently
not have ...

I did the sync in the following way:

- checked out in the linux tree the commit with which the U-Boot
sync was done.

- copy all linux mtd,ubi and ubifs files to the U-Boot mtd,ubi,ubifs
code

-> git diff will shows all U-Boot specific changes
-> save this patch

- now in the linux tree checked out the new commit I wanted to sync
U-Boot with

- copy all linux mtd,ubi and ubifs files from the new linux commit
to the U-Boot mtd,ubi,ubifs code

- committed this for documentation only

- apply the u-boot specific changes patch now
- fixed small errors
This worked with some small correction very fast ...

ToDo:

- test
- commit and send to ML

>> To sync us with each kernel release would be a good idea, but the
>> problem would be, to find time for it ...
>
> Yes, but I think if we do it more regularly it will be better for us and
> take less time.

Definitely.

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