From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] Pull request for u-boot-arm -> u-boot?
Date: Mon, 5 May 2014 19:46:13 +0200 [thread overview]
Message-ID: <201405051946.13541.marex@denx.de> (raw)
In-Reply-To: <5367C06C.3060307@wwwdotorg.org>
On Monday, May 05, 2014 at 06:46:36 PM, Stephen Warren wrote:
> Albert,
>
> I was wondering when the next pull request for u-boot-arm/master ->
> u-boot/master was likely to be?
>
> I asked because some changes to the Tegra USB driver went through the
> u-boot-tegra/master and hence are now in u-boot-arm/master, but not in
> u-boot-usb/master. I have some more USB driver changes which rely on the
> earlier USB patches, and these should really go through
> u-boot-usb/master rather than the Tegra/ARM tree. For this to happen,
> u-boot-usb/master needs to contain the patches currently in
> u-boot-arm/master, and the best way for that to happen is for those
> patches to get into u-boot/master so that u-boot-usb/master can merge them.
>
> Or, should Marek just merge u-boot-arm/master into his tree directly?
I will not merge u-boot-arm/master into my tree, no. I will wait for the higher-
ups to solve this ... Albert, we're waiting :b
Best regards,
Marek Vasut
next prev parent reply other threads:[~2014-05-05 17:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-05 16:46 [U-Boot] Pull request for u-boot-arm -> u-boot? Stephen Warren
2014-05-05 17:46 ` Marek Vasut [this message]
2014-05-09 8:39 ` Albert ARIBAUD
2014-05-05 17:46 ` Tom Rini
2014-05-09 9:57 ` Albert ARIBAUD
2014-05-05 17:59 ` Fabio Estevam
2014-05-05 18:12 ` Otavio Salvador
2014-05-05 18:53 ` Marek Vasut
2014-05-05 18:15 ` Stephen Warren
2014-05-05 18:40 ` Tom Rini
2014-05-05 18:52 ` Stephen Warren
2014-05-05 18:54 ` Marek Vasut
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=201405051946.13541.marex@denx.de \
--to=marex@denx.de \
--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.