Re: [U-Boot] [PATCH] Fix issues introduced by 16fc32f: unify {CONFIG_, }ENV_IS_EMBEDDED
On Tuesday 25 August 2009 04:46:07 Albin Tonnerre wrote: > Commit 16fc32f introduced an error in include/environment.h, which makes > u-boot fail to compile due to a missing #endif. > This also fixes a merge conflict remaining in > include/configs/EB+MCF-EV123.h which was caused by the same commit this is only an issue for the "next" branch ... my local git tree has the right number of #endif's, so i guess i must have sent out the wrong patch guess this needs to get squashed into the relevant change rather than added as a new commit. thanks for the update. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Fix issues introduced by 16fc32f: unify {CONFIG_, }ENV_IS_EMBEDDED
On Tue, Aug 25, 2009 at 06:16:24AM -0400, Mike Frysinger wrote : > On Tuesday 25 August 2009 04:46:07 Albin Tonnerre wrote: > > Commit 16fc32f introduced an error in include/environment.h, which makes > > u-boot fail to compile due to a missing #endif. > > This also fixes a merge conflict remaining in > > include/configs/EB+MCF-EV123.h which was caused by the same commit > > this is only an issue for the "next" branch ... > > my local git tree has the right number of #endif's, so i guess i must have > sent out the wrong patch > > guess this needs to get squashed into the relevant change rather than added > as > a new commit. thanks for the update. How exactly would you do that? The commit actually got pushed, and AFAIK next doesn't get rebased Regards, -- Albin Tonnerre, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Fix issues introduced by 16fc32f: unify {CONFIG_, }ENV_IS_EMBEDDED
Dear Albin Tonnerre, In message <20090825102110.ge10...@pc-ras4041.res.insa> you wrote: > > > guess this needs to get squashed into the relevant change rather than added > > as > > a new commit. thanks for the update. > > How exactly would you do that? The commit actually got pushed, and AFAIK next > doesn't get rebased It gets rebased when there is a need to do so. This seems to be such a case. 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 1 1 was a race-horse, 2 2 was 1 2. When 1 1 1 1 race, 2 2 1 1 2. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Fix issues introduced by 16fc32f: unify {CONFIG_, }ENV_IS_EMBEDDED
Dear Albin Tonnerre, In message <1251189967-11702-1-git-send-email-albin.tonne...@free-electrons.com> you wrote: > Commit 16fc32f introduced an error in include/environment.h, which makes > u-boot > fail to compile due to a missing #endif. > This also fixes a merge conflict remaining in include/configs/EB+MCF-EV123.h > which was caused by the same commit > > Signed-off-by: Albin Tonnerre > --- > include/configs/EB+MCF-EV123.h |7 --- > include/environment.h |1 + > 2 files changed, 1 insertions(+), 7 deletions(-) Applied to "next" branch (and rebased "next" to clean up the mess). Thanks for catching / fixing this. 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 You don't have to worry about me. I might have been born yesterday... but I stayed up all night. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
