From: Allen Martin <amartin@nvidia.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Conflicting commits for seaboard USB keyboard handling
Date: Wed, 19 Dec 2012 16:32:08 -0800 [thread overview]
Message-ID: <20121220003208.GD15608@badger> (raw)
In-Reply-To: <20121219234224.75bed961@lilith>
On Wed, Dec 19, 2012 at 02:42:24PM -0800, Albert ARIBAUD wrote:
> Hi Allen,
>
> > Hi Albert, I did a merge of u-boot/master into u-boot-arm/master and
> > resolved the conflicts and I've pushed the result to:
> >
> > git://github.com/arm000/u-boot.git
> > branch: u-boot-arm-merge-resolved
> >
> > I resolved all the conflicts, but the only ones I claim I did
> > correctly were the changes to:
> >
> > include/configs/seaboard.h
> > include/configs/tegra-common-post.h
> >
> > the other conflicts were not related to tegra.
> >
> > If you want a new pull request, you'll first have to unroll the
> > previously merged tegra patches from u-boot-arm/master so I can give
> > you a conflict free merge request.
>
> Thanks Allen, this branch is what I wanted exactly -- I don't want to
> ask for a rollback. As soon as I am sure about the samsung branch, I'll
> merge all "fix" branches into ARM.
Ok, let me know if you have any problems resolving and I'll try to
help the best I can.
Tom, you'll need to rebase u-boot-tegra/next on top of this, and there
will be conflicts when you do. I've resolved those as well for
reference and pushed to:
git://github.com/arm000/u-boot.git
branch: u-boot-tegra-next-rebased
-Allen
--
nvpublic
next prev parent reply other threads:[~2012-12-20 0:32 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-09 6:03 [U-Boot] Conflicting commits for seaboard USB keyboard handling Albert ARIBAUD
2012-12-10 16:25 ` Tom Warren
2012-12-10 16:59 ` Tom Warren
2012-12-10 19:25 ` Allen Martin
2012-12-10 21:15 ` Tom Warren
2012-12-10 21:51 ` Tom Warren
2012-12-11 19:02 ` Allen Martin
2012-12-15 16:41 ` Albert ARIBAUD
2012-12-17 22:13 ` Tom Warren
2012-12-17 22:22 ` Allen Martin
2012-12-18 16:43 ` Tom Warren
2012-12-18 18:06 ` Allen Martin
2012-12-18 23:59 ` Tom Warren
2012-12-19 1:08 ` Allen Martin
2012-12-19 6:04 ` Stephen Warren
2012-12-19 19:37 ` Albert ARIBAUD
2012-12-19 21:11 ` Allen Martin
2012-12-19 22:42 ` Albert ARIBAUD
2012-12-20 0:32 ` Allen Martin [this message]
2012-12-20 17:16 ` Tom Warren
2012-12-13 19:20 ` Albert ARIBAUD
2012-12-14 16:48 ` Tom Warren
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=20121220003208.GD15608@badger \
--to=amartin@nvidia.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