From: Kim Phillips <kim.phillips@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [PATCH] mpc83xx: Fix the fatal conflict of merge
Date: Thu, 17 Jan 2008 14:08:32 -0600 [thread overview]
Message-ID: <20080117140832.4d845a2a.kim.phillips@freescale.com> (raw)
In-Reply-To: <1200566152.3656.12.camel@localhost.localdomain>
On Thu, 17 Jan 2008 18:35:52 +0800
Dave Liu <r63238@freescale.com> wrote:
> > The commit 9e89647889cd4b5ada5b5e7cad6cbe55737a08d7
> > will cause the mpc8315erdb board can't boot up.
>
> Hi Wolfgang,
>
> I don't know when the merge window will close today,
> Because the patch fix the fatal conflict, I wish it
> can be merged to main tree in this window.
>
> If Kim can not take the patch to 83xx tree and request to you
> before the window close, could you apply it to main tree directly?
>
applied.
WD, if you care to wait I'm about to send YAPR (Yet Another Pull
Request).
Kim
prev parent reply other threads:[~2008-01-17 20:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-17 10:23 [U-Boot-Users] [PATCH] mpc83xx: Fix the fatal conflict of merge Dave Liu
2008-01-17 10:35 ` Dave Liu
2008-01-17 20:08 ` Kim Phillips [this message]
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=20080117140832.4d845a2a.kim.phillips@freescale.com \
--to=kim.phillips@freescale.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 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.