All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefano Babic <sbabic@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PULL] : Please pull u-boot-imx - correction
Date: Sat, 11 May 2013 11:39:58 +0200	[thread overview]
Message-ID: <518E11EE.7050907@denx.de> (raw)
In-Reply-To: <20130511111509.15eacd6d@lilith>

On 11/05/2013 11:15, Albert ARIBAUD wrote:

Hi Albert,

>> Applied to u-boot-arm/master (with two trivial merge resolutions),
>> thanks!
> 
> Seems like the trivial merge resolution was less trivial than I thought
> it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c
> the definitions for nand_init() and nand_deselect(). For some reason
> I missed it in the MAKEALL -a arm I did. Rolling back and fixing this.

Please make modifications on top of your current tree - after your first
e-mail, I have already pulled from u-boot-arm and pushed to the server.
If you go back, I had to rebase my tree.

Best regards,
Stefano


-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

  reply	other threads:[~2013-05-11  9:39 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-07  7:55 [U-Boot] [PULL] : Please pull u-boot-imx Stefano Babic
2013-05-11  7:30 ` Albert ARIBAUD
2013-05-11  9:15   ` [U-Boot] [PULL] : Please pull u-boot-imx - correction Albert ARIBAUD
2013-05-11  9:39     ` Stefano Babic [this message]
2013-05-11  9:47       ` Albert ARIBAUD
2013-05-11 10:50         ` Stefano Babic
2013-05-11 10:58           ` Stefano Babic
2013-05-11 11:07             ` Albert ARIBAUD
2013-05-11 11:18               ` Stefano Babic
2013-05-11 11:01           ` Albert ARIBAUD
2013-05-11 11:15             ` Stefano Babic
2013-05-11 11:26               ` Albert ARIBAUD
2013-05-11 11:36                 ` Stefano Babic
2013-05-11 14:32                   ` Albert ARIBAUD
2013-05-11 20:54                     ` [U-Boot] [PULL] : Please pull u-boot-imx - correction done Albert ARIBAUD
2013-05-11  9:47       ` [U-Boot] [PULL] : Please pull u-boot-imx - correction Albert ARIBAUD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=518E11EE.7050907@denx.de \
    --to=sbabic@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.