public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 2/3] tegra: move TEGRA_DEVICE_SETTINGS to tegra-common-post.h
Date: Wed, 24 Oct 2012 00:01:21 +0200	[thread overview]
Message-ID: <201210240001.22135.marex@denx.de> (raw)
In-Reply-To: <5086C788.3070202@wwwdotorg.org>

Dear Stephen Warren,

> On 10/23/2012 01:27 AM, Marek Vasut wrote:
> > Dear Allen Martin,
> > 
> >> Move environment settings for stdin/stdout/stderr to
> >> tegra-common-post.h and generate them automaticaly based on input
> >> device selection.
> >> 
> >> Signed-off-by: Allen Martin <amartin@nvidia.com>
> > 
> > 2/3 and 3/3 should go through tegra, thanks
> 
> Although of course patches 2 & 3 depend on patch 1. So, the process
> would have to be:
> 
> 1) Apply patch 1 to USB tree.
> 2) Send pull request for USB to main U-Boot repo.
> 3) Pull request actioned.
> 4) Wait until latest u-boot/master is picked in u-boot/arm and hence
> u-boot/tegra.
> 5) Apply patches 2 & 3 to the Tegra tree.
> 
> That's quite a long round-trip. What's the typical delay between (1) and
> (2) or (3) and (4)?
> 
> In the Linux kernel, this would be handled by putting patch (1) into a
> topic branch on its own, which can then be merged into both the USB
> branch and immediately into Tegra's branch. Of course, that all relies
> on never rebasing during pull requests (otherwise, the branch with patch
> 1 might end up being applied as two different commits when merging into
> u-boot/master); something which apparently isn't acceptable for U-Boot:-(

Fine, then if you agree, I'll pull them all through usb tree ?

Best regards,
Marek Vasut

  reply	other threads:[~2012-10-23 22:01 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-23  5:47 [U-Boot] [PATCH v2 1/3] USB: make usb_kbd obey USB DMA alignment requirements Allen Martin
2012-10-23  5:47 ` [U-Boot] [PATCH v2 2/3] tegra: move TEGRA_DEVICE_SETTINGS to tegra-common-post.h Allen Martin
2012-10-23  7:27   ` Marek Vasut
2012-10-23 16:36     ` Stephen Warren
2012-10-23 22:01       ` Marek Vasut [this message]
2012-10-23 22:18         ` Stephen Warren
2012-10-24  0:30         ` Allen Martin
2012-11-02 20:06         ` Allen Martin
2012-11-02 20:40           ` Marek Vasut
2012-10-23 16:41   ` Stephen Warren
2012-10-23  5:47 ` [U-Boot] [PATCH v2 3/3] tegra: Enable USB keyboard Allen Martin
2012-10-23  7:26 ` [U-Boot] [PATCH v2 1/3] USB: make usb_kbd obey USB DMA alignment requirements Marek Vasut
2012-10-23 16:31   ` Stephen Warren
2012-10-23 16:51   ` Allen Martin
2012-10-23 22:04     ` Marek Vasut
2012-10-23 16:51 ` Stephen Warren
2012-10-23 17:02   ` Allen Martin
2012-10-23 22:03     ` Marek Vasut
2012-10-24  0:39       ` Allen Martin
2012-10-24  0:46         ` Allen Martin
2012-10-24  7:31         ` Marek Vasut
2012-10-24 17:24           ` Allen Martin
2012-10-24 20:17             ` Marek Vasut
2012-10-24 20:41               ` Stephen Warren

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=201210240001.22135.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox