public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Jerry Van Baren <gvb.uboot@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [GIT PULL] mpc83xx: reset status, 8360rev2.1 support, mpc8323erdb support, bugfixes
Date: Wed, 08 Aug 2007 11:21:13 -0400	[thread overview]
Message-ID: <46B9DF69.3050507@gmail.com> (raw)
In-Reply-To: <20070727182317.daf10d7c.kim.phillips@freescale.com>

Kim Phillips wrote:
> Hello Wolfgang,
> 
> Please pull the u-boot-testing.git tree.
> 
> Then, please do a:
> 
>         git pull git://www.denx.de/git/u-boot-mpc83xx.git mpc83xx
> 
> to receive the following updates:

[snip]

> btw, I think there would be more testing work done if you applied
> patches directly to the main u-boot.git tree (bypassing
> u-boot-testing.git). I know it would save me (and others) the hassle
> of always having to merge it.
> 
> Thanks,
> Kim

[snip]

Hi Wolfgang,

Have you done Kim's pull request yet?  I don't see any evidence of it. 
Kim and I traded some patches back and forth, so I would prefer his repo 
be pulled before -fdt so I can discover and fix any merge conflicts that 
may occur due to my neophyte git techniques.

WRT Kim's question on the -testing repo, what is the order or 
expectation for merges?  I've been expecting that the custodian repos 
will be pulled directly into the main repo and have been doing my 
pull/merges against that repo, not the testing repo.  If -testing is a 
stepping stone, I need to include that in my pull/merge to resolve any 
conflicts before they hit you.

Thanks,
gvb

  reply	other threads:[~2007-08-08 15:21 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-27 23:23 [U-Boot-Users] [GIT PULL] mpc83xx: reset status, 8360rev2.1 support, mpc8323erdb support, bugfixes Kim Phillips
2007-08-08 15:21 ` Jerry Van Baren [this message]
2007-08-08 15:49   ` Wolfgang Denk
2007-08-08 15:57     ` Jerry Van Baren
2007-08-09 20:39 ` Wolfgang Denk
2007-08-10  2:33   ` Dave Liu
2007-08-10  8:30     ` 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=46B9DF69.3050507@gmail.com \
    --to=gvb.uboot@gmail.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox