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] [GIT PULL] Pull request: u-boot-staging
Date: Tue, 22 Nov 2011 08:18:01 +0100	[thread overview]
Message-ID: <4ECB4CA9.9020407@denx.de> (raw)
In-Reply-To: <CAPnjgZ1grF+19yo6QOej4C-G78MK9JwSXSSc0dS08SAyS=OKiw@mail.gmail.com>

On 22/11/2011 06:06, Simon Glass wrote:
> Hi Stefano,
> 

Hi Simon,

>> CONFLICT (content): Merge conflict in lib/hashtable.c
> 
> For this conflict I am sending a V4 patch to the list.

Thanks - I remove in the meantime the two patches that does not apply
anymore (the other one is from Andreas), and I will resubmit the pull
request. I take care of your patch in the next round.

Stefano

-- 
=====================================================================
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
=====================================================================

  reply	other threads:[~2011-11-22  7:18 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-18  8:58 [U-Boot] [GIT PULL] Pull request: u-boot-staging Stefano Babic
2011-11-21 21:10 ` Wolfgang Denk
2011-11-22  5:06   ` Simon Glass
2011-11-22  7:18     ` Stefano Babic [this message]
2011-11-22  8:59   ` Stefano Babic
2011-11-22 22:28     ` Wolfgang Denk
     [not found]     ` <4ECC9D3F.2080100@compulab.co.il>
2011-11-23  8:16       ` Stefano Babic
2011-11-23  9:09         ` Igor Grinberg
2011-11-23 16:01           ` Wolfgang Denk
2011-11-23 16:26             ` Igor Grinberg
2011-11-23 16:57               ` Stefano Babic
2011-11-23 17:08                 ` Andy Fleming
2011-11-23 20:14                   ` Wolfgang Denk
2011-11-24  6:57                     ` Igor Grinberg
2011-11-24 11:51                       ` Wolfgang Denk
2011-11-24 12:15                         ` Igor Grinberg
2011-11-23 20:12                 ` Wolfgang Denk
2011-11-24  6:48                   ` Igor Grinberg
2011-11-24  7:02                     ` Graeme Russ
2011-11-24  7:24                       ` Igor Grinberg
2011-11-24 11:53                       ` Wolfgang Denk
2011-11-24 11:46                     ` Wolfgang Denk
2011-11-24 12:33                       ` Igor Grinberg
2011-11-28 18:52                         ` Wolfgang Denk
2011-11-29  7:34                           ` Igor Grinberg
  -- strict thread matches above, loose matches on Subject: below --
2011-11-23  7:37 Heiko Schocher
2011-11-23 20:26 ` Wolfgang Denk
2011-12-09 13:50 [U-Boot] [GIT PULL] Pull request u-boot-staging Stefano Babic
2011-12-10 21:43 ` Wolfgang Denk

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=4ECB4CA9.9020407@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.