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

Wolfgang Denk
2014-06-22T07:36:43Z

Dear Heiko,

In message <53A67ED9.2090705@denx.de> you wrote:
>
> And I have no chance to detect this difference, when using
> "git am -3 ..." ... it just remains in the code ...
>
> I vote for copying the linux files, marking U-Boot specific code
> with __UBOOT__ ...

Given the complexity of the code - and of the changes added in U-Boot
to the original (old) Linux code (which were done over a period of
time) - I think indeed that your original approach is the better one;
better both in the sense of requiring less efforts (for creating and
verifying that all chanes were covered), and less risk to miss
individual modifications either from the Linux or from the U-Boot
side.

Scott, I agree that your suggestion is what usually should work fine,
but here it apparently fails in a number of places that would be time
consuming to sort out - and I would expect that the same would happen
again whenever we update to another new version of the Linux code
base. So I think we should stick with Heiko's approach here; it
documents clearly what he did, it looks complete, and it is working.
I think it would be a waste of time to redo all the work, just
differently.

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Testing can show the presense of bugs, but not their absence.
-- Edsger Dijkstra