From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 0/3] mtd, ubi, ubifs: resync with Linux-3.14
Date: Tue, 24 Jun 2014 08:58:46 +0200 [thread overview]
Message-ID: <201406240858.46675.marex@denx.de> (raw)
In-Reply-To: <53A9031B.6090107@denx.de>
On Tuesday, June 24, 2014 at 06:48:27 AM, 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:
> >>> 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
>
> Yes I fear such fallout too ... I could also test on some boards only,
> the rest is compile clean only ... thats the reason why I had the sync
> serie as RFC ... maybe we create a mtd-test branch? But on the other
> hand, things maybe get tested only, if they are in mainline ...
I'd vouch to apply this first thing after .07 is out and fix the problems which
arise as we see them. It'd also be really nice to see MTD synced more often, any
volunteers ?
Best regards,
Marek Vasut
next prev parent reply other threads:[~2014-06-24 6:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 7:15 [U-Boot] [PATCH v4 0/3] mtd, ubi, ubifs: resync with Linux-3.14 Heiko Schocher
2014-06-17 7:15 ` [U-Boot] [PATCH v4 1/3] lib, rbtree: " Heiko Schocher
2014-06-17 7:15 ` [U-Boot] [PATCH v4 2/3] lib, list_sort: add list_sort from linux 3.14 Heiko Schocher
2014-06-17 7:15 ` [U-Boot] [PATCH v4 3/3] mtd, ubi, ubifs: resync with Linux-3.14 Heiko Schocher
2014-06-17 15:54 ` [U-Boot] [PATCH v4 0/3] " Scott Wood
2014-06-18 7:55 ` Heiko Schocher
2014-06-18 21:24 ` Scott Wood
2014-06-18 21:42 ` Tom Rini
2014-06-19 10:34 ` Heiko Schocher
2014-06-19 23:45 ` Scott Wood
2014-06-20 7:59 ` Heiko Schocher
2014-06-22 6:59 ` Heiko Schocher
2014-06-22 7:36 ` Wolfgang Denk
2014-06-23 15:05 ` Tom Rini
2014-06-24 4:48 ` Heiko Schocher
2014-06-24 6:58 ` Marek Vasut [this message]
2014-06-24 14:36 ` Tom Rini
2014-06-24 14:39 ` Tom Rini
2014-06-25 4:50 ` Heiko Schocher
2014-06-24 19:19 ` Scott Wood
2014-06-25 4:56 ` Heiko Schocher
2014-06-26 7:51 ` Wolfgang Denk
2014-06-30 20:20 ` Scott Wood
2014-06-30 22:56 ` Wolfgang Denk
2014-06-30 23:09 ` Scott Wood
2014-07-01 10:45 ` Wolfgang Denk
2014-07-06 18:04 ` Wolfgang Denk
2014-07-07 16:12 ` Tom Rini
2014-07-07 17:24 ` Wolfgang Denk
2014-07-07 19:59 ` Scott Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201406240858.46675.marex@denx.de \
--to=marex@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox