From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Mon, 18 Jul 2011 14:11:50 +0200 Subject: [U-Boot] OMAP3 SPL: merge window question In-Reply-To: <20110718113124.GA3183@Zitronenbaum> References: <20110718082935.GB3867@Zitronenbaum> <4E23F307.7000105@aribaud.net> <20110718113124.GA3183@Zitronenbaum> Message-ID: <4E242306.1000007@aribaud.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Simon, Le 18/07/2011 13:31, Simon Schwarz a ?crit : > Dear Albert Aribaud, Just "Albert" is fine. :) > On 18.07.11, Albert Aribaud wrote: >> You mean you can release a patch before the end of the week, right? >> >> Personally, when a patch was initially submitted before the end of >> the merge window, I will accept subsequent versions of it and apply >> them even if they are submitted after the merge window has closed. > > The problem is that most of my old OMAP3 patch is obsoleted by Aneesh's > OMAP4 patch (http://marc.info/?l=u-boot&m=131082102506002&w=2) and the new SPL- > Framework (http://marc.info/?l=u-boot&m=131056990001719&w=2). > > Therefore most of my old patch will be invalid - and some new parts will be > added. It will be a major change not just some corrections. I am not bothered by the fact that after your initial submission, another patch set was submitted that forces you to submit a rebased and adapted patch set version. What might bother *you*, however, is that ATM the SPL framework patches are RFC, so they won't be applied as such, and Aneesh's OMAP4 patches are not applied yet. And you need those patches applied for yours to be. But if it *does* happen, I am fine with it. :) Amicalement, -- Albert.