From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Pull request: u-boot-arm/master
Date: Sun, 17 Mar 2013 15:40:48 -0400 [thread overview]
Message-ID: <51461C40.2000200@ti.com> (raw)
In-Reply-To: <20130316091958.447f06a4@lilith>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 03/16/2013 04:19 AM, Albert ARIBAUD wrote:
> Hi Albert,
>
> On Fri, 15 Mar 2013 23:01:12 +0100, Albert ARIBAUD
> <albert.u.boot@aribaud.net> wrote:
>
>> Hello Tom,
>>
>> Here is a PR for ARM. Note that doc/README.scrapyard will need a
>> manual merge resolution due to ARM tree having a commit that
>> reorders the headers and reformats the lines while mainline has a
>> commit adding two new entries still in the older format.
>>
>> The following changes since commit
>> fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4:
>>
>> x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52
>> -0800)
>>
>> are available in the git repository at:
>>
>> git://git.denx.de/u-boot-arm master
>>
>> for you to fetch changes up to
>> b27673ccbd3d5435319b5c09c3e7061f559f925d:
>>
>> Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
>> (2013-03-15 20:50:43 +0100)
>
> Sorry about the extra merge conflicts -- at the time of my posting,
> I only had the scapyard one. Seems like most new conflicts are due
> to Simon's BSS name change; that should be resolved by taking my
> BSS changes and changing the symbol's name as Simon does elsewhere,
> but by the looks of your IRC comment, you'd already figured it out
> and only the tegra conflict is left to resolve.
I suspect I have all conflicts resolved correctly, but can't run-time
test them. If someone with a Tegra platform would like to get ahold
of me privately, quickly, I'll send along a binary to try out and
confirm I've got the merge correct. Otherwise I'll post the diff
monday morning.
- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJRRhxAAAoJENk4IS6UOR1W70gP/0O2fnhKbuNYHw5g0BT8iapR
+xfhKflu5+QDIcruCDX4QkzxgG8onvrBwAkjahSWMjJy+QRRjwM4ik24HYMzLbMN
jWjy/AkJ9hAfrp4Knq/dcKkordM97Bsg0E2mrnSxJTxqQ8vRU5UzZdBga7bl3YRK
U5+YeN5c9ZmGHHtbmhw7zbcPo+7ZwRQEhiMMa4hnCzjZiCu7h3ZNTCuenu/povcr
enQ3LmGtmJdBHsyMccuYh0EJNnYeMnfFmNk5S3roH1ryxqiTOFZIk5n6O7xLxWBD
BxeFC+KmFAt+pbXtl/CUrW0WWyw8YsecO5q/chl0tKXt/EeGGbcuABQ5RrBkXsYU
zD0anY0y9xip8R81IRwbINqvOPxX0tkhJXSQoL6luYNgggZxt4xqrYEUaHaBQJE1
04jy12qRdH5ijUci6/PexY6yigS5yK+G3oiy7GVqSPWW/b3aCgdlygBSsKFONY9p
KHjRNWMz5V/JRCDI0doEzsqJMO94OqGpyZLa6GWIyy6Fk+nheja/OZtDg/fQaSin
10V8GU9YqZ47Ojbr3r2thfDOsmxp4ICjIm2zoKPUuNG9JPImAf3CTtD+DGkijoU/
NIHqHjV3kBSVpxROTfNc8yc+jEjik7FoFCaRTjknKajuZbRTW8anQPiaSmX12WfR
/3UQOpob05rx+OCYYEpq
=L6aj
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2013-03-17 19:40 UTC|newest]
Thread overview: 259+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 22:01 [U-Boot] Pull request: u-boot-arm/master Albert ARIBAUD
2013-03-16 8:19 ` Albert ARIBAUD
2013-03-17 19:40 ` Tom Rini [this message]
2013-03-18 17:06 ` Tom Rini
2013-03-18 17:43 ` Albert ARIBAUD
2013-03-18 18:38 ` Tom Rini
-- strict thread matches above, loose matches on Subject: below --
2016-01-31 20:40 Albert ARIBAUD
2016-02-01 16:54 ` Tom Rini
2015-11-10 17:45 Albert ARIBAUD
2015-11-10 20:15 ` Tom Rini
2015-10-15 21:19 Albert ARIBAUD
2015-10-15 22:00 ` Tom Rini
2015-07-31 1:06 Albert ARIBAUD
2015-08-01 14:47 ` Tom Rini
2015-07-06 15:20 Albert ARIBAUD
2015-07-06 21:15 ` Tom Rini
2015-07-06 22:09 ` Albert ARIBAUD
2015-07-06 23:59 ` Tom Rini
2015-07-07 5:49 ` Albert ARIBAUD
2015-07-07 10:01 ` Albert ARIBAUD
2015-07-02 21:27 Albert ARIBAUD
2015-07-02 22:55 ` Tom Rini
2015-07-05 14:11 ` Albert ARIBAUD
2015-05-05 9:30 Albert ARIBAUD
2015-05-05 23:59 ` Tom Rini
2015-01-04 18:11 Albert ARIBAUD
2015-01-05 15:10 ` Tom Rini
2014-11-24 17:30 Albert ARIBAUD
2014-11-24 22:13 ` Tom Rini
2014-11-13 7:54 Albert ARIBAUD
2014-11-08 0:07 Albert ARIBAUD
2014-11-10 21:28 ` Tom Rini
2014-10-11 0:38 Albert ARIBAUD
2014-10-11 11:49 ` Tom Rini
2014-10-07 11:16 Albert ARIBAUD
2014-10-07 16:02 ` Tom Rini
2014-09-17 21:40 Albert ARIBAUD
2014-09-18 1:00 ` Tom Rini
2014-09-12 13:42 Albert ARIBAUD
2014-09-12 19:15 ` Tom Rini
2014-07-29 13:08 Albert ARIBAUD
2014-07-29 14:30 ` Tom Rini
2014-07-05 8:18 Albert ARIBAUD
2014-07-05 16:48 ` Tom Rini
2014-07-04 22:57 Albert ARIBAUD
2014-07-05 0:20 ` Tom Rini
2014-07-02 20:33 Albert ARIBAUD
2014-07-02 22:38 ` Tom Rini
2014-06-08 7:51 Albert ARIBAUD
2014-06-09 2:25 ` Tom Rini
2014-05-30 15:20 Albert ARIBAUD
2014-05-30 17:59 ` Tom Rini
2014-05-24 9:32 Albert ARIBAUD
2014-05-24 20:37 ` Tom Rini
2014-05-20 8:57 Albert ARIBAUD
2014-05-22 19:12 ` Tom Rini
2014-05-09 9:56 Albert ARIBAUD
2014-05-09 16:15 ` Tom Rini
2014-04-08 11:40 Albert ARIBAUD
2014-04-08 16:39 ` Tom Rini
2014-03-10 18:16 Albert ARIBAUD
2014-03-10 21:27 ` Tom Rini
2014-02-26 21:40 Albert ARIBAUD
2014-02-26 23:39 ` Tom Rini
2014-02-13 17:43 Albert ARIBAUD
2014-02-18 17:50 ` Tom Rini
2014-02-18 18:21 ` Stephen Warren
2014-02-18 18:29 ` Tom Rini
2014-02-18 18:47 ` Albert ARIBAUD
2014-01-15 15:16 Albert ARIBAUD
2014-01-14 13:04 Albert ARIBAUD
2014-01-14 21:02 ` Tom Rini
2014-01-13 18:49 Albert ARIBAUD
2014-01-13 19:42 ` Tom Rini
2014-01-10 15:43 Albert ARIBAUD
2014-01-10 20:03 ` Tom Rini
2014-01-11 8:11 ` Albert ARIBAUD
2013-12-10 22:05 Albert ARIBAUD
2013-12-11 16:44 ` Tom Rini
2013-11-09 22:53 Albert ARIBAUD
2013-11-11 19:13 ` Tom Rini
2013-10-11 14:33 Albert ARIBAUD
2013-10-14 15:20 ` Tom Rini
2013-10-07 20:02 Albert ARIBAUD
2013-10-08 19:33 ` Tom Rini
2013-10-03 20:42 Albert ARIBAUD
2013-10-04 18:46 ` Tom Rini
2013-10-02 15:34 Albert ARIBAUD
2013-10-02 18:20 ` Tom Rini
2013-09-12 13:18 Albert ARIBAUD
2013-09-12 15:11 ` Tom Rini
2013-09-12 20:54 ` Albert ARIBAUD
2013-09-06 22:55 Albert ARIBAUD
2013-09-09 14:56 ` Tom Rini
2013-07-10 20:33 [U-Boot] pull " Albert ARIBAUD
2013-06-21 21:52 [U-Boot] Pull " Albert ARIBAUD
2013-06-24 20:17 ` Tom Rini
2013-06-13 15:49 Albert ARIBAUD
2013-06-14 15:11 ` Tom Rini
2013-06-05 15:02 [U-Boot] pull " Albert ARIBAUD
2013-06-07 18:20 ` Tom Rini
2013-05-30 19:29 [U-Boot] Pull " Albert ARIBAUD
2013-05-31 20:51 ` Tom Rini
2013-04-17 16:37 Albert ARIBAUD
2013-04-18 20:17 ` Tom Rini
2013-04-15 19:36 Albert ARIBAUD
2013-04-16 15:58 ` Tom Rini
2013-04-14 19:32 Albert ARIBAUD
2013-04-15 15:51 ` Tom Rini
2013-04-10 23:12 Albert ARIBAUD
2013-04-10 23:20 ` Benoît Thébaudeau
2013-04-11 6:10 ` Albert ARIBAUD
2013-03-28 20:06 Albert ARIBAUD
2013-03-29 0:01 ` Tom Rini
2013-02-12 14:25 Albert ARIBAUD
2013-02-15 16:33 ` Tom Rini
2013-01-14 16:58 Albert ARIBAUD
2013-01-14 23:18 ` Tom Rini
2013-01-11 21:36 Albert ARIBAUD
2013-01-11 23:44 ` Tom Rini
2013-01-09 14:43 Albert ARIBAUD
2013-01-09 19:35 ` Tom Rini
2013-01-08 15:07 Albert ARIBAUD
2013-01-08 20:50 ` Simon Glass
2013-01-08 21:01 ` Albert ARIBAUD
2013-01-08 21:06 ` Simon Glass
2013-01-08 22:34 ` Tom Rini
2012-12-22 12:11 Albert ARIBAUD
2012-12-22 15:20 ` Tom Rini
2013-01-03 6:41 ` Joonyoung Shim
2013-01-03 7:12 ` Lukasz Majewski
2012-11-04 21:51 Albert ARIBAUD
2012-11-05 16:54 ` Tom Rini
2012-11-05 19:45 ` Stephen Warren
2012-11-08 15:08 ` Tom Rini
2012-10-26 22:30 Albert ARIBAUD
2012-10-27 0:20 ` Tom Rini
2012-10-19 23:55 Albert ARIBAUD
2012-10-20 17:39 ` Tom Rini
2012-10-05 19:26 Albert ARIBAUD
2012-10-05 22:26 ` Tom Rini
2012-10-04 16:57 Albert ARIBAUD
2012-10-04 18:31 ` Tom Rini
2012-09-21 21:35 Albert ARIBAUD
2012-09-22 0:21 ` Tom Rini
2012-09-01 16:37 Albert ARIBAUD
2012-09-01 22:27 ` Wolfgang Denk
2012-07-10 6:30 Albert ARIBAUD
2012-07-10 7:04 ` Wolfgang Denk
2012-07-07 12:12 Albert ARIBAUD
2012-07-08 20:13 ` Wolfgang Denk
2012-05-15 6:57 Albert ARIBAUD
2012-05-20 20:33 ` Wolfgang Denk
2012-04-16 14:52 Albert ARIBAUD
2012-04-16 18:18 ` Marek Vasut
2012-04-16 20:09 ` Albert ARIBAUD
2012-04-16 20:15 ` Albert ARIBAUD
2012-04-17 5:33 ` Stefano Babic
2012-03-30 7:10 Albert ARIBAUD
2012-03-30 17:58 ` Wolfgang Denk
2012-02-27 20:23 Albert ARIBAUD
2012-03-03 14:09 ` Wolfgang Denk
2012-02-12 9:16 Albert ARIBAUD
2012-02-12 21:06 ` Wolfgang Denk
2012-01-16 8:16 Albert ARIBAUD
2012-01-17 21:36 ` Wolfgang Denk
2011-12-24 9:27 Albert ARIBAUD
2012-01-05 15:53 ` Wolfgang Denk
2011-12-19 16:55 Albert ARIBAUD
2011-12-20 21:40 ` Wolfgang Denk
2011-12-11 13:38 Albert ARIBAUD
2011-12-12 6:58 ` Wolfgang Denk
2011-12-09 16:42 Albert ARIBAUD
2011-12-10 21:54 ` Wolfgang Denk
2011-12-06 23:17 Albert ARIBAUD
2011-12-07 10:16 ` Wolfgang Denk
2011-11-15 21:28 Albert ARIBAUD
2011-11-16 0:04 ` Simon Glass
2011-11-16 2:27 ` Marek Vasut
2011-11-16 3:45 ` Simon Glass
2011-11-16 3:53 ` Mike Frysinger
2011-11-16 4:05 ` Simon Glass
2011-11-16 19:24 ` Wolfgang Denk
2011-11-17 13:45 ` Albert ARIBAUD
2011-11-17 21:39 ` Mike Frysinger
2011-11-17 21:56 ` Wolfgang Denk
2011-11-17 22:03 ` Albert ARIBAUD
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF1740D74CB5@HQMAIL01.nvidia.com>
[not found] ` <7E91C59574E9954FA075F8D8CCDF78DB38FE7FF7A9@HQMAIL04.nvidia.com>
2011-11-17 22:04 ` Simon Glass
2011-11-16 6:28 ` Heiko Schocher
2011-11-16 19:42 ` Wolfgang Denk
2011-11-07 20:58 Albert ARIBAUD
2011-11-08 0:02 ` Wolfgang Denk
2011-09-30 20:09 Albert ARIBAUD
2011-10-01 19:40 ` Wolfgang Denk
2011-10-04 5:35 ` Simon Glass
2011-10-21 18:44 ` Albert ARIBAUD
2011-10-21 19:12 ` Simon Glass
2011-09-28 6:38 Albert ARIBAUD
2011-09-28 18:42 ` Wolfgang Denk
2011-09-22 21:03 Albert ARIBAUD
2011-09-23 6:29 ` Wolfgang Denk
2011-09-14 6:57 Albert ARIBAUD
2011-09-15 12:24 ` Wolfgang Denk
2011-08-31 10:13 Albert ARIBAUD
2011-08-31 11:57 ` Marek Vasut
2011-09-01 8:59 ` Aneesh V
2011-09-03 19:26 ` Albert ARIBAUD
2011-09-04 8:44 ` Aneesh V
2011-09-04 9:01 ` Albert ARIBAUD
2011-09-04 9:02 ` Aneesh V
2011-09-04 9:12 ` Albert ARIBAUD
2011-09-04 9:17 ` Aneesh V
2011-08-04 12:28 Albert ARIBAUD
2011-07-18 13:38 Albert ARIBAUD
2011-07-18 14:31 ` Igor Grinberg
2011-07-18 17:52 ` Albert ARIBAUD
2011-08-12 8:21 ` Albert ARIBAUD
2011-07-18 19:17 ` Wolfgang Denk
2011-07-04 9:08 Albert ARIBAUD
2011-07-04 22:32 ` Wolfgang Denk
2011-06-30 6:24 Albert ARIBAUD
2011-06-30 11:15 ` Albert ARIBAUD
2011-06-28 5:39 Albert ARIBAUD
2011-06-28 9:52 ` Igor Grinberg
2011-06-28 10:20 ` Igor Grinberg
2011-06-28 21:19 ` Albert ARIBAUD
2011-06-28 10:48 ` Wolfgang Denk
2011-06-29 6:09 ` Albert ARIBAUD
2011-06-29 21:09 ` Wolfgang Denk
2011-06-21 20:28 Albert ARIBAUD
2011-06-22 9:17 ` Wolfgang Denk
2011-06-22 12:18 ` Wolfgang Denk
2011-06-22 13:51 ` Albert ARIBAUD
2011-06-08 20:41 Albert ARIBAUD
2011-06-08 21:32 ` Wolfgang Denk
2011-05-31 20:31 Albert ARIBAUD
2011-05-31 22:29 ` John Rigby
2011-06-01 17:15 ` Albert ARIBAUD
2011-06-01 20:15 ` Wolfgang Denk
2011-05-11 21:07 Albert ARIBAUD
2011-05-11 22:11 ` Rogan Dawes
2011-05-12 5:41 ` Albert ARIBAUD
2011-05-12 8:48 ` Prafulla Wadaskar
2011-05-12 9:06 ` Simon Guinot
2011-05-12 9:12 ` Simon Guinot
2011-05-12 17:27 ` Wolfgang Denk
2011-05-14 18:38 ` Dirk Behme
2011-04-28 16:14 Albert ARIBAUD
2011-04-28 21:17 ` Wolfgang Denk
2011-04-27 17:40 Albert ARIBAUD
2011-04-27 20:16 ` Wolfgang Denk
2011-04-27 23:42 ` Macpaul Lin
2011-04-28 21:14 ` Wolfgang Denk
2011-04-29 1:31 ` Macpaul Lin
2011-04-30 20:44 ` Wolfgang Denk
2011-05-02 8:46 ` Macpaul Lin
2011-05-02 10:31 ` Wolfgang Denk
2011-03-27 17:25 Albert ARIBAUD
2011-03-27 19:32 ` Wolfgang Denk
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=51461C40.2000200@ti.com \
--to=trini@ti.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.