All of lore.kernel.org
 help / color / mirror / Atom feed
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge
Date: Thu, 30 May 2013 14:55:41 +0200	[thread overview]
Message-ID: <20130530145541.7d6958de@lilith> (raw)

Hello Tom and Bo,

While preparing for my ARM PR, I have encountered two merge conflicts.
Their resolution can be found in branch 'merge_from_mainline' of ARM
repo git://git.denx.de/u-boot-arm.

For common/cmd_fpga.c, the merge conflict was trivial -- Simon's
renaming fit somehow caused a need for manual resolution just to
select the version with the right name. Simon, can you confirm that my
resolution is correct?

For drivers/usb/host/ohci-at91.c, the conflicting commits are both from
Bo, respectively 158947d2 (committed by Marek) and e5e8bb05 (commited
by Andreas). Bo, can you confirm that my resolution is correct?

If both resolutions are correct, then at Tom's discretion, either I'll
move my master there and submit what should then be a fast-forward PR,
or I'll submit current master and Tom will replay my resolutions when
doing his merge. Tom, your preference?

Thanks in advance to all!

Amicalement,
-- 
Albert.

             reply	other threads:[~2013-05-30 12:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-30 12:55 Albert ARIBAUD [this message]
2013-05-30 13:03 ` [U-Boot] Conflict resolution for u-boot-arm/master and u-boot/master merge Tom Rini
2013-05-30 13:33 ` Bo Shen
2013-05-30 16:21 ` Albert ARIBAUD
2013-05-30 16:38   ` Simon Glass
2013-05-30 17:37     ` Albert ARIBAUD
2013-05-31  1:08       ` Simon Glass

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=20130530145541.7d6958de@lilith \
    --to=albert.u.boot@aribaud.net \
    --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.