| Message ID | CAPnjgZ2CB2VuUzdo1ZOZ7h2sAUYc_+rBK5LaTbGC4kRa8rLpCw@mail.gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Aug 13, 2014 at 08:46:48AM -0600, Simon Glass wrote: > The following changes since commit 5b7d0027c2463101dabf337a7cccd768fc20b85e: > > Merge branch 'master' of git://git.denx.de/u-boot-blackfin > (2014-08-12 16:54:55 -0400) > > are available in the git repository at: > > http://git.denx.de/u-boot-x86.git > > for you to fetch changes up to e49f14af1349eef94e41b636320bbfcace7403b5: OK, the x86 and dm repositories have gotten mixed up I think with what you've pushed: $ git fetch git://git.denx.de/u-boot-x86.git master $ git log --oneline origin/master..FETCH_HEAD a193cc9 dm: Expand and improve the device lifecycle docs 8c0ce6f dm: Tidy up four minor code nits eabbdc8 tegra: Enable driver model bfab7d3 tegra: dts: Bring in GPIO bindings from linux bb5d586 dm: Fix printf() strings in the 'dm' command 6a89571 dm: Allow driver model tests only for sandbox 7559956e dm: Cast away the const-ness of the global_data pointer b40c4e4 dm: Add missing header files in lists and root 8bcde49 dm: Use case-insensitive comparison for GPIO banks 8a028ab dm: Update README to encourage conversion to driver model e0db60d dm: Rename struct device_id to udevice_id 068dd6c Makefile: Support include files for .dts files ff0ef4a sandbox: Support iotrace feature 83aece4 arm: Support iotrace feature ddfccb1 Add an I/O tracing feature Is what I see. And it doesn't pull cleanly either :)
Hi Tom, On 13 August 2014 09:26, Tom Rini <trini@ti.com> wrote: > On Wed, Aug 13, 2014 at 08:46:48AM -0600, Simon Glass wrote: > >> The following changes since commit 5b7d0027c2463101dabf337a7cccd768fc20b85e: >> >> Merge branch 'master' of git://git.denx.de/u-boot-blackfin >> (2014-08-12 16:54:55 -0400) >> >> are available in the git repository at: >> >> http://git.denx.de/u-boot-x86.git >> >> for you to fetch changes up to e49f14af1349eef94e41b636320bbfcace7403b5: > > OK, the x86 and dm repositories have gotten mixed up I think with what > you've pushed: > $ git fetch git://git.denx.de/u-boot-x86.git master > $ git log --oneline origin/master..FETCH_HEAD > a193cc9 dm: Expand and improve the device lifecycle docs > 8c0ce6f dm: Tidy up four minor code nits > eabbdc8 tegra: Enable driver model > bfab7d3 tegra: dts: Bring in GPIO bindings from linux > bb5d586 dm: Fix printf() strings in the 'dm' command > 6a89571 dm: Allow driver model tests only for sandbox > 7559956e dm: Cast away the const-ness of the global_data pointer > b40c4e4 dm: Add missing header files in lists and root > 8bcde49 dm: Use case-insensitive comparison for GPIO banks > 8a028ab dm: Update README to encourage conversion to driver model > e0db60d dm: Rename struct device_id to udevice_id > 068dd6c Makefile: Support include files for .dts files > ff0ef4a sandbox: Support iotrace feature > 83aece4 arm: Support iotrace feature > ddfccb1 Add an I/O tracing feature > > Is what I see. And it doesn't pull cleanly either :) Those patches are already in mainline. Do you think that is because I didn't update 'master' in that repo? I've done it now - can you please retry the buildman branch? Regards, Simon
On Wed, Aug 13, 2014 at 09:31:58AM -0600, Simon Glass wrote: > Hi Tom, > > On 13 August 2014 09:26, Tom Rini <trini@ti.com> wrote: > > On Wed, Aug 13, 2014 at 08:46:48AM -0600, Simon Glass wrote: > > > >> The following changes since commit 5b7d0027c2463101dabf337a7cccd768fc20b85e: > >> > >> Merge branch 'master' of git://git.denx.de/u-boot-blackfin > >> (2014-08-12 16:54:55 -0400) > >> > >> are available in the git repository at: > >> > >> http://git.denx.de/u-boot-x86.git > >> > >> for you to fetch changes up to e49f14af1349eef94e41b636320bbfcace7403b5: > > > > OK, the x86 and dm repositories have gotten mixed up I think with what > > you've pushed: > > $ git fetch git://git.denx.de/u-boot-x86.git master > > $ git log --oneline origin/master..FETCH_HEAD > > a193cc9 dm: Expand and improve the device lifecycle docs > > 8c0ce6f dm: Tidy up four minor code nits > > eabbdc8 tegra: Enable driver model > > bfab7d3 tegra: dts: Bring in GPIO bindings from linux > > bb5d586 dm: Fix printf() strings in the 'dm' command > > 6a89571 dm: Allow driver model tests only for sandbox > > 7559956e dm: Cast away the const-ness of the global_data pointer > > b40c4e4 dm: Add missing header files in lists and root > > 8bcde49 dm: Use case-insensitive comparison for GPIO banks > > 8a028ab dm: Update README to encourage conversion to driver model > > e0db60d dm: Rename struct device_id to udevice_id > > 068dd6c Makefile: Support include files for .dts files > > ff0ef4a sandbox: Support iotrace feature > > 83aece4 arm: Support iotrace feature > > ddfccb1 Add an I/O tracing feature > > > > Is what I see. And it doesn't pull cleanly either :) > > Those patches are already in mainline. Do you think that is because I > didn't update 'master' in that repo? I've done it now - can you please > retry the buildman branch? Ah, the URI didn't say 'buildman' so I guessed wrong on where to look. Applied to u-boot/master, thanks!
The following changes since commit 5b7d0027c2463101dabf337a7cccd768fc20b85e: Merge branch 'master' of git://git.denx.de/u-boot-blackfin (2014-08-12 16:54:55 -0400) are available in the git repository at: http://git.denx.de/u-boot-x86.git for you to fetch changes up to e49f14af1349eef94e41b636320bbfcace7403b5: patman: Only use git's --no-decorate when available (2014-08-13 08:34:16 -0600) ---------------------------------------------------------------- Simon Glass (15): buildman: Fix a few typos buildman: Add some notes about moving from MAKEALL buildman: Allow building of current source tree buildman: Move BuilderThread code to its own file buildman: Sort command line options buildman: Refactor output options buildman: Add verbose option to display errors as they happen buildman: Remove unused non-incremental build method code buildman: Add an option to specify the buildman config file buildman: Add a message indicating there are no errors buildman: Add a few more toolchain examples to the README buildman: Introduce an 'and' operator for board selection buildman: Allow selection of the number of commits to build patman: Move the 'git log' command into a function patman: Only use git's --no-decorate when available tools/buildman/README | 159 +++++++++++++++++++-- tools/buildman/board.py | 144 ++++++++++++++++--- tools/buildman/builder.py | 545 ++++++++++-------------------------------------------------------------- tools/buildman/builderthread.py | 434 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/buildman/buildman.py | 16 ++- tools/buildman/control.py | 108 ++++++++++----- tools/buildman/test.py | 56 +++++++- tools/patman/gitutil.py | 40 +++++- tools/patman/patchstream.py | 11 +- 9 files changed, 947 insertions(+), 566 deletions(-) create mode 100644 tools/buildman/builderthread.py