From: Simon Schwarz <simonschwarzcor@googlemail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] OMAP3 SPL: merge window question
Date: Mon, 18 Jul 2011 13:31:24 +0200 [thread overview]
Message-ID: <20110718113124.GA3183@Zitronenbaum> (raw)
In-Reply-To: <4E23F307.7000105@aribaud.net>
Dear Albert Aribaud,
On 18.07.11, Albert Aribaud wrote:
> You mean you can release a patch before the end of the week, right?
>
> Personally, when a patch was initially submitted before the end of
> the merge window, I will accept subsequent versions of it and apply
> them even if they are submitted after the merge window has closed.
The problem is that most of my old OMAP3 patch is obsoleted by Aneesh's
OMAP4 patch (http://marc.info/?l=u-boot&m=131082102506002&w=2) and the new SPL-
Framework (http://marc.info/?l=u-boot&m=131056990001719&w=2).
Therefore most of my old patch will be invalid - and some new parts will be
added. It will be a major change not just some corrections.
But I had to wait for these two patches to get finished to add my changes
otherwise duplicated and incomaptible work would have been done.
> Only, be sure to follow *all* rules for submitting new versions of a
> patch set as laid out in <http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions>
> . Particularly:
>
> - *always* provide history for *each* patch
>
> - *always* provide history *below* the commit message delimiter ('---')
>
> - *always* post version N of a patch "in-reply-to" version N-1.
>
> - *never* post a patch set twice under the same version. Even if you
> forgot some trivial thing like signed-off-by, repost with a *bumped
> up* version number (and provide updated history)
>
> Be warned that not respecting these rules will result in the patch
> set being NAKed (and, in turn, will force you to re-post a Vn+1
> patch...)
Understood.
Regards
Simon
next prev parent reply other threads:[~2011-07-18 11:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 8:29 [U-Boot] OMAP3 SPL: merge window question Simon Schwarz
2011-07-18 8:47 ` Albert ARIBAUD
2011-07-18 9:39 ` Graeme Russ
2011-07-18 12:03 ` Wolfgang Denk
2011-07-18 12:11 ` Graeme Russ
2011-07-18 12:29 ` Wolfgang Denk
2011-07-18 13:26 ` Holger Brunck
2011-07-18 11:31 ` Simon Schwarz [this message]
2011-07-18 11:59 ` Graeme Russ
2011-07-18 12:11 ` Albert ARIBAUD
2011-07-18 12:30 ` Wolfgang Denk
2011-07-18 14:19 ` Daniel Schwierzeck
2011-07-18 14:54 ` Aneesh V
2011-07-18 15:15 ` Daniel Schwierzeck
2011-07-18 16:07 ` Wolfgang Denk
2011-07-26 12:46 ` Wolfgang Denk
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=20110718113124.GA3183@Zitronenbaum \
--to=simonschwarzcor@googlemail.com \
--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.