From: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
To: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
Cc: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>,
arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [GIT PULL 5/8] ARM: tegra: SCU base rework
Date: Fri, 1 Feb 2013 15:51:43 +0000 [thread overview]
Message-ID: <201302011551.43947.arnd@arndb.de> (raw)
In-Reply-To: <510B4892.3050900-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
On Friday 01 February 2013, Stephen Warren wrote:
> Hmm. And here I was thinking that I was basing branches on top of
> each-other too much given your previous comments about merge conflicts
> being OK!
IMHO the cleanup branches are special in this regard because they
are primarily meant as a way to resolve the merge conflicts.
If you are able to put all the conflicts between the normal branches
into cleanup patches, you can put them all in one branch and
base your other branches on top of that. Of course that doesn't
always work, but it would solve this particular instance.
Arnd
next prev parent reply other threads:[~2013-02-01 15:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-30 21:42 [GIT PULL 1/8] ARM: tegra: cleanup Stephen Warren
[not found] ` <1359582159-28816-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-01-30 21:42 ` [GIT PULL 2/8] ARM: tegra: Common Clock Framework rework Stephen Warren
2013-01-30 21:42 ` [GIT PULL 3/8] ARM: tegra: USB driver cleanup Stephen Warren
2013-01-30 21:42 ` [GIT PULL 4/8] ARM: tegra: cpuidle enhancements Stephen Warren
2013-01-30 21:42 ` [GIT PULL 5/8] ARM: tegra: SCU base rework Stephen Warren
[not found] ` <1359582159-28816-5-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-02-01 4:32 ` Olof Johansson
[not found] ` <20130201043222.GC5844-O5ziIzlqnXUVNXGz7ipsyg@public.gmane.org>
2013-02-01 4:35 ` Olof Johansson
[not found] ` <CAOesGMjjgz7Am7-D_fQHqgLX=G+Wc_LKL-GYMHd1-NzVC-DUfA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-02-01 4:46 ` Stephen Warren
[not found] ` <510B4892.3050900-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-02-01 15:51 ` Arnd Bergmann [this message]
2013-01-30 21:42 ` [GIT PULL 6/8] ARM: tegra: add Tegra114 SoC support Stephen Warren
2013-01-30 21:42 ` [GIT PULL 7/8] ARM: tegra: device tree updates Stephen Warren
2013-01-30 21:42 ` [GIT PULL 8/8] ARM: tegra: defconfig update Stephen Warren
[not found] ` <1359582159-28816-8-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-02-05 21:26 ` Olof Johansson
[not found] ` <20130205212604.GA30719-O5ziIzlqnXUVNXGz7ipsyg@public.gmane.org>
2013-02-06 0:26 ` 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=201302011551.43947.arnd@arndb.de \
--to=arnd-r2ngtmty4d4@public.gmane.org \
--cc=arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
--cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \
/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