[U-Boot] Please pull u-boot-x86 branch 'sandbox'

[Tom Rini]

On Sun, Apr 19, 2015 at 02:57:21PM -0600, Simon Glass wrote:
> Hi Tom,
> 
> On 19 April 2015 at 14:32, Tom Rini <trini at konsulko.com> wrote:
> > On Sun, Apr 19, 2015 at 02:19:41PM -0600, Simon Glass wrote:
> >> Hi Tom,
> >>
> >> On 19 April 2015 at 12:28, Tom Rini <trini at konsulko.com> wrote:
> >> > On Sun, Apr 19, 2015 at 07:23:08AM -0600, Simon Glass wrote:
> >> >
> >> >> Hi Tom,
> >> >>
> >> >> Here are the queued sandbox changes, to allow sandbox to use the
> >> >> distro booting feature.
> >> >>
> >> >>
> >> >> The following changes since commit 5ab83ec1a13601c4f76ce009afe0d1ee51f1ad9c:
> >> >>
> >> >>   sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig (2015-04-13
> >> >> 20:53:47 -0600)
> >> >>
> >> >> are available in the git repository at:
> >> >>
> >> >>   http://git.denx.de/u-boot-x86.git
> >> >>
> >> >> for you to fetch changes up to 71beb9b91d691a045220b3092f3363b1f0cf833a:
> >> >>
> >> >>   sandbox: add config_distro_defaults and config_distro_bootcmd
> >> >> (2015-04-18 16:27:13 -0600)
> >> >>
> >> >
> >> > This conflicts pretty badly now for some reason:
> >> > # Unmerged paths:
> >> > #   (use "git add/rm <file>..." as appropriate to mark resolution)
> >> > #
> >> > #       both modified:      Makefile
> >> > #       both modified:      arch/arm/dts/exynos5420-peach-pit.dts
> >> > #       both modified:      arch/arm/dts/exynos5800-peach-pi.dts
> >> > #       both modified:      arch/arm/mach-bcm283x/Kconfig
> >> > #       both modified:      arch/sandbox/cpu/cpu.c
> >> > #       both modified:      arch/sandbox/lib/Makefile
> >> > #       both modified:      common/usb.c
> >> > #       both modified:      common/usb_storage.c
> >> > #       both modified:      drivers/usb/host/ehci-hcd.c
> >> > #       both modified:      include/configs/sandbox.h
> >> >
> >> > Can you please rebase and resend?  Thanks!
> >>
> >> Will do - I'll wait until master is updated.
> >
> > OK thanks.  Note that https://github.com/u-boot/u-boot gets updated when
> > I push (along with my personal github) even if it's technically a mirror
> > of the main site.
> 
> I wonder why that updates faster? It looks like the problem is the

Because I configured git to have 3 write URIs for when I push :)

> rebase I did on dm/master when merging in your fixes. I just now
> dropped everything but the last 9 patches in a 'git rebase -i' and it
> looks OK. But I'll run it through buildman again before sending since
> the rebase could have caused problems.

That's what I suspected.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150419/6d5b7fcf/attachment.sig>