From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Wed, 21 Dec 2011 09:46:23 +0100 Subject: [U-Boot] [PATCH 0/9] mkenvimage: v10/v11 diff split into several patches In-Reply-To: <4EF130AE.4060204@free-electrons.com> References: <1322080098-3151-1-git-send-email-david.wagner@free-electrons.com> <201111271459.04557.vapier@gentoo.org> <4EF130AE.4060204@free-electrons.com> Message-ID: <4EF19CDF.6050406@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 21/12/2011 02:04, David Wagner wrote: > Hi, > > I re-sent 2 patches that didn't apply anymore on top of next (v2 2/10 > and v2 3/10) ; the others should be fine. > > I also sent one more patch ([PATCH 09/10] Correctly handle input files > beginning with several newlines) > > Could you please apply them ? See Thomas's answer : there are not resolved conflicts in your last patch. Solve them, and I will take care of the patchset. However, I do not know if it can go into the release (Wolfgang will decide about it). Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================