public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] Merge conflict on Tegra SPI between u-boot/master and u-boot-arm/master
Date: Thu, 28 Mar 2013 14:38:23 +0100	[thread overview]
Message-ID: <20130328143823.7cb30d58@lilith> (raw)

Hello all,

While preparing for an ARM PR, specifically a merge between commit
417c55803118eb8e350d5ab8ba6583fb39f4e2e3 (current u-boot/master ToT)
and commit d53e340edf65ff253d3a7b06ebe60501045892e3 (current Tot for
u-boot-arm/master), I hit the following merge conflicts:

CONFLICT (content): Merge conflict in lib/fdtdec.c
CONFLICT (content): Merge conflict in include/fdtdec.h
CONFLICT (content): Merge conflict in drivers/spi/tegra20_sflash.c

While the first two, related to FDT, are simple (colliding additions to
the same enum from both branches) and can be manually resolved, the
third one, drivers/spi/tegra20_sflash.c, is not, and can not, at least,
not by me, as I am not a specialist on Tegra SPI.

Tom (Warren), can you advise on how to best solve this?

Amicalement,
-- 
Albert.

             reply	other threads:[~2013-03-28 13:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-28 13:38 Albert ARIBAUD [this message]
2013-03-28 15:08 ` [U-Boot] Merge conflict on Tegra SPI between u-boot/master and u-boot-arm/master Tom Warren
2013-03-28 15:16   ` Tom Warren
2013-03-28 17:47     ` Albert ARIBAUD

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=20130328143823.7cb30d58@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox