[U-Boot] Pull request: u-boot-arm/master

Albert ARIBAUD albert.u.boot at aribaud.net
Thu Apr 11 08:10:52 CEST 2013


Hi Benoît,

On Thu, 11 Apr 2013 01:20:44 +0200 (CEST), Benoît Thébaudeau
<benoit.thebaudeau at advansee.com> wrote:

> Hi Albert,
> 
> On Thursday, April 11, 2013 1:12:17 AM, Albert ARIBAUD wrote:
> > Hello,
> > 
> > The following changes since commit
> > 009d75ccc11d27b9a083375a88bb93cb746b4800:
> > 
> >   Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-03-28
> >   18:50:01 +0100)
> > 
> > are available in the git repository at:
> > 
> > 
> >   git://git.denx.de/u-boot-arm master
> > 
> > for you to fetch changes up to aad17a2f2bdd0b456522e24a90a0f8b8d8adb1f9:
> > 
> >   ARM: fix CONFIG_SPL_MAX_SIZE semantics (2013-04-11 00:18:03 +0200)
> > 
> > *** NOTE *** there should be a single, and trivial, merge conflict on
> > file drivers/video/exynos_fb.c.

> You have forgotten to apply this one:
> http://patchwork.ozlabs.org/patch/233964/

Thanks for pointing it out -- it got flushed from my mental cache by
the SPL max size one.

I have superseded my original request, am build-testing for any hiccup, 
and will sent out an amended PR including 233964 (with the typo in the
commit fixed).

> Best regards,
> Benoît

Amicalement,
-- 
Albert.


More information about the U-Boot mailing list