All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Markus Klotzbücher" <mk@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] USB custodian repostiory updates
Date: Mon, 07 May 2007 16:59:12 +0200	[thread overview]
Message-ID: <87tzuor873.fsf@denx.de> (raw)
In-Reply-To: <20070507132245.9FD93353A05@atlas.denx.de> (Wolfgang Denk's message of "Mon, 07 May 2007 15:22:45 +0200")

Dear Wolfgang,

Wolfgang Denk <wd@denx.de> writes:

> in message <87ps5csu46.fsf@denx.de> you wrote:
>>
>> Please pull from the "master" branch at git://denx.de/git/u-boot-usb.git 
>
> Sorry, but you have unresolved merge problems in your tree: I noticed
> it in the CHANGELOG file:

This seems to have been inherited from old testing-usb branch:

http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff;h=d3c5e8b2f5945d93de8f23b053e9dcd033983245

I've moved the old Changelog entry to CHANGELOG-before-U-Boot-1.1.5.

> but you might want to check all other files as well.

I can't see any other. Please try again.

Best regards

Markus Klotzb?cher

--
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office:  Kirchenstr. 5,       D-82194 Groebenzell,            Germany

  reply	other threads:[~2007-05-07 14:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-03 14:43 [U-Boot-Users] USB custodian repostiory updates Markus Klotzbücher
2007-05-07 12:20 ` Markus Klotzbücher
2007-05-07 13:22   ` Wolfgang Denk
2007-05-07 14:59     ` Markus Klotzbücher [this message]
2007-05-14 11:39     ` [U-Boot-Users] please PULL u-boot-usb.git Markus Klotzbücher

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=87tzuor873.fsf@denx.de \
    --to=mk@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.