From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Wed, 13 Aug 2014 09:31:58 -0600 Subject: [U-Boot] Please pull u-boot-x86.git branch buildman In-Reply-To: <20140813152621.GD19374@bill-the-cat> References: <20140813152621.GD19374@bill-the-cat> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, On 13 August 2014 09:26, Tom Rini 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