From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] i.MX cleanups
Date: Thu, 7 Jul 2011 10:50:58 +0200 [thread overview]
Message-ID: <201107071050.58303.arnd@arndb.de> (raw)
In-Reply-To: <20110707081424.GY6069@pengutronix.de>
On Thursday 07 July 2011 10:14:24 Sascha Hauer wrote:
> [once again with the list on Cc]
>
> Please pull the following i.MX cleanup patches. This branch is directly
> based on the previous fixes pull request. I tried making this is
> independent on the fixes branch, but it resulted in merge conflicts.
I'll have a look later today and pull everything in.
As a general recommendation, simple merge conflicts are fine, I can handle
them. If you get a serious conflict, there are multiple ways of dealing
with it:
* create another branch that holds just the commits that cause the conflict,
then base the other branches on top of that.
* base one branch on top of the other. After the first one is upstream,
the second one will only contain the changes it really wants.
In either way, this will result in increasing the number of pull requests
to stagger the merge upstream, so it's better not to need it.
The most important thing is to warn of any conflicts and dependencies so
I can deal with them.
Arnd
prev parent reply other threads:[~2011-07-07 8:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-07 8:14 [GIT PULL] i.MX cleanups Sascha Hauer
2011-07-07 8:50 ` Arnd Bergmann [this message]
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=201107071050.58303.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.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