From: Linus Torvalds <torvalds@linux-foundation.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Junio C Hamano <gitster@pobox.com>,
Russell King - ARM Linux <linux@arm.linux.org.uk>,
linux-kernel@vger.kernel.org, Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL 05/11] SoC-level changes for tegra and omap
Date: Wed, 11 Jan 2012 22:41:36 -0800 [thread overview]
Message-ID: <CA+55aFxY5JGEGgeR8S8JKR_xC75g8MYOiVvGfisQGxf5oXD+7Q@mail.gmail.com> (raw)
In-Reply-To: <CAMuHMdWnoKowa0atP0k5X4vukJTnQSNSh9gibxd1Y2e60qK3RQ@mail.gmail.com>
On Wed, Jan 11, 2012 at 10:32 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
>
> That's why you need two branches:
> 1. a non-rebasing one for development,
> 2. a rebasing one containing cherry-picked (possibly folded) commits for
> preparing for upstream delivery.
Stop being a moron.
Go back and read the "nobody can work with you". If you rebase for
upstream delivery, then that means that everybody that works with you
are workign with a tree that isn't ready for delivery, and that they
cannot rely on.
Just don't do it. If your tree is so ugly that you can't deliver it
upstream, then don't deliver it sideways or downstream either. Keep it
in your own pants, and don't make it public at all. Since nobody can
trust it anyway, and since it isn't the final end result, why even
bother? They can't rely on it, they can't work with it.
So here's the *real* solution:
- make sure your development tree is in good enough shape that you
can make it public, and can ask me to pull it.
It really is that simple. If you don't think it's in good enough
shape, don't make it public.
Linus
next prev parent reply other threads:[~2012-01-12 6:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-09 22:12 [GIT PULL 00/11] arm-soc changes Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 01/11] Non-critical bug fixes Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 02/11] Cleanups on various subarchitectures Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 03/11] Device tree conversions for samsung and tegra Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 04/11] Cleanups for the Samsung platforms Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 05/11] SoC-level changes for tegra and omap Arnd Bergmann
2012-01-09 22:37 ` Linus Torvalds
2012-01-10 8:39 ` Russell King - ARM Linux
2012-01-10 16:08 ` Linus Torvalds
2012-01-11 0:15 ` Junio C Hamano
2012-01-11 18:12 ` Arnd Bergmann
2012-01-11 20:29 ` Geert Uytterhoeven
2012-01-11 21:53 ` Nicolas Pitre
2012-01-11 23:21 ` Linus Torvalds
2012-01-12 6:32 ` Geert Uytterhoeven
2012-01-12 6:41 ` Linus Torvalds [this message]
2012-01-09 22:12 ` [GIT PULL 06/11] Board-level changes Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 07/11] New feature development Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 08/11] Driver specific changes Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 09/11] power management changes for omap and imx Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 10/11] timer changes for msm Arnd Bergmann
2012-01-09 22:12 ` [GIT PULL 11/11] clock management changes for i.MX Arnd Bergmann
2012-01-09 22:55 ` [GIT PULL 00/11] arm-soc changes Linus Torvalds
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=CA+55aFxY5JGEGgeR8S8JKR_xC75g8MYOiVvGfisQGxf5oXD+7Q@mail.gmail.com \
--to=torvalds@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=geert@linux-m68k.org \
--cc=gitster@pobox.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
/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;
as well as URLs for NNTP newsgroup(s).