From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Fabio Estevam <fabio.estevam@freescale.com>,
Arnd Bergmann <arnd@arndb.de>,
"Arnaud Patard (Rtp)" <arnaud.patard@rtp-net.org>
Subject: Re: linux-next: manual merge of the i.MX tree with the arm-soc tree
Date: Sun, 11 Sep 2011 13:34:10 +1000 [thread overview]
Message-ID: <20110911133410.a1de21cd74e0af9c9ee51549@canb.auug.org.au> (raw)
In-Reply-To: <20110909064058.GF28816@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 591 bytes --]
Hi Uwe,
On Fri, 9 Sep 2011 08:40:58 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>
> Do you prefer that conflicts like these are resolved before you get
> them?
> (I.e. I could have done
>
> git merge -s ours $somecommitfromthearmsoctree
>
> but I wasn't sure that this is a good idea and so decided to wait until
> you write a mail about the conflict.)
No, these small conflicts are not a problem, so just leave them to me and
Arnd or Linus.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-09-11 3:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-09 1:44 Stephen Rothwell
2011-09-09 6:40 ` Uwe Kleine-König
2011-09-11 3:34 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-09 1:40 Stephen Rothwell
2011-09-09 6:41 ` Uwe Kleine-König
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=20110911133410.a1de21cd74e0af9c9ee51549@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnaud.patard@rtp-net.org \
--cc=arnd@arndb.de \
--cc=fabio.estevam@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=u.kleine-koenig@pengutronix.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
all inboxes | Powered by JetHome®