From: Wolfgang Denk Date: Sat, 18 Sep 2010 23:37:28 +0200 Subject: [U-Boot] [STATUS] v2010.09-rc1 is out / v2010.09 delayed by 2 weeks In-Reply-To: <4C8B1A02.4070301@googlemail.com> References: <20100910175440.604771524F7@gemini.denx.de> <4C8B1A02.4070301@googlemail.com> Message-ID: <20100918213728.4FEAE157D71@gemini.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 Dear Dirk Behme, In message <4C8B1A02.4070301@googlemail.com> you wrote: > Dear Wolfgang, > > On 10.09.2010 19:54, Wolfgang Denk wrote: > > ... check if all your relevant patches have been > > included. > > What's about > > http://lists.denx.de/pipermail/u-boot/2010-July/074542.html Doesn't apply: Applying: Remove unused variable bi_env fatal: sha1 information is lacking or useless (common/cmd_bdinfo.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Remove unused variable bi_env When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". > ? Or if you don't like that, this > > http://lists.denx.de/pipermail/u-boot/2010-August/075303.html This one has been applied to the "next" branch. 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: wd at denx.de Monday is an awful way to spend one seventh of your life.