On Sun, Jun 22, 2014 at 09:36:43AM +0200, Wolfgang Denk wrote: > Dear Heiko, > > In message <53a67ed9.2090...@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.
OK, lets try this. One worry at the back of my mind is the fallout we had when we re-synced to v3.7.1 and tested things as best we were able to prior to merge. I think it's too late in the cycle to pull this in for v2014.07, but lets get something in for v2014.10. And since v3.15 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. -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
