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 18:47:18 +0100 [thread overview]
Message-ID: <20130328184718.393fa484@lilith> (raw)
In-Reply-To: <CA+m5__Lt_tKrWnYMQEDgaFVcL1WdJDAXBDC9iFaDDcX6-9whvQ@mail.gmail.com>
Hi Tom,
> Just confirmed - in tegra20_sflash.c, remove the <<<<< HEAD section (#ifdef
> CONFIG_OF_CONTROL + 2 lines), and keep the "tegra: spi remove non fdt
> support" section (spi->slave.bus = bus + 4 lines).
Ok, thanks a lot for confirming. I'll do the merge (and tests)
accordingly on u-boot-arm and then send out my PR to The Other
Tom.
Amicalement,
--
Albert.
prev parent reply other threads:[~2013-03-28 17:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-28 13:38 [U-Boot] Merge conflict on Tegra SPI between u-boot/master and u-boot-arm/master Albert ARIBAUD
2013-03-28 15:08 ` Tom Warren
2013-03-28 15:16 ` Tom Warren
2013-03-28 17:47 ` Albert ARIBAUD [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=20130328184718.393fa484@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