From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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: Fri, 9 Sep 2011 08:40:58 +0200 [thread overview]
Message-ID: <20110909064058.GF28816@pengutronix.de> (raw)
In-Reply-To: <20110909114436.5afc4ef772143d90ce75c7c5@canb.auug.org.au>
Hi Stephen,
(I'm responsible for this, as Sascha is on vacation.)
On Fri, Sep 09, 2011 at 11:44:36AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the i.MX tree got a conflict in
> arch/arm/plat-mxc/devices/platform-pata_imx.c between commit 236c4e8be436
> ("ARM: imx: Add PATA resources for other i.MX processors") from the
> arm-soc tree and commit 8354b5d2a1c5 ("ARM: imx: Add PATA resources for
> other i.MX processors") from the i.MX tree.
>
> The latter appears to be a corrected version of the former (despite
> having the same Author date ...) so I used that.
Yeah, if you look at the commit logs you will notice that the better
commit has an additional comment:
[ukleinek: squashed in a fix by Arnaud Patard (Rtp) <arnaud.patard@rtp-net.o
fixing the resource size calculation]
Arnd already promised me to replace the older version of the imx tree in
arm-soc with the current one. The problem is just that kernel.org is
down ...
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.)
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-09-09 6:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-09 1:44 linux-next: manual merge of the i.MX tree with the arm-soc tree Stephen Rothwell
2011-09-09 6:40 ` Uwe Kleine-König [this message]
2011-09-11 3:34 ` Stephen Rothwell
-- 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=20110909064058.GF28816@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--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=sfr@canb.auug.org.au \
/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).