On Tue, Dec 6, 2011 at 11:35 AM, Wolfgang Denk <w...@denx.de> wrote: > Dear Anton Staaf, > > In message > <caf6fioweof1rwckrfwusobcybwu4g4xp84proirb5hcbfjk...@mail.gmail.com> you > wrote: >> >> Whimper whimper. This is silly, what happened was that two different >> patches collided when committed. Mine had the correct change to this >> file. Doug Andersons also touched this file but reverted the change. >> So when both changes went in the result was that these lines didn't >> change. Since then there have been no fewer than four attempts to get >> this simple fix committed. I have acked and pinged at least two of >> them. One finally made it into the ARM tree. Someone should just put >> this into the main tree because that is where my changes to add the >> MACRO went in initially. Oh, and we really don't want to have a >> default for CONFIG_SYS_CACHELINE_SIZE, especially not in this file. > > What exactly is wrong - in your opinion - in the current master?
I don't believe that there is anything wrong right now. My whimpering was more about the sheer number of messages have been generated by this patch collision. Not a big deal since as far as I can tell master is OK. Thanks, Anton > 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: w...@denx.de > SW engineering is a race between programmers trying to make better > idiot-proof programs and the universe producing greater idiots. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot