From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Warren Date: Sat, 25 Apr 2009 00:18:44 -0700 Subject: [U-Boot] U-Boot ARM merge strategy, was: there are non-DM6446 DaVinci chips In-Reply-To: <200904250003.51845.david-b@pacbell.net> References: <200904121544.23683.david-b@pacbell.net> <49F29CF0.1010304@googlemail.com> <200904250003.51845.david-b@pacbell.net> Message-ID: <49F2B954.5040408@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi David, David Brownell wrote: > On Friday 24 April 2009, Ben Warren wrote: > >> My approach is that once the merge window closes, new patches that are not >> bug fixes go into 'next', which is for the release after the current one (in >> this case 07). >> > > Then I'm curious how that dm9000 EEPROM reading bugfix > landed in net/next ... or is the point that the merge > window for 2009.05 is still open, since RC1 hasn't yet > been tagged? > > In this case a pretty good argument could be made that it's a bug fix and not a feature, so can go in 2009.05. Obviously bugs that break builds get more attention than ones that have been in code for a while and nobody noticed. I'll ask Wolfgang to pick it up directly. As you're noticing, how and when patches are picked up is open to many interpretations. regards, Ben