From: Russell King <rmk@arm.linux.org.uk>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Eric Bénard" <eric@eukrea.com>
Subject: Re: linux-next: manual merge of the arm tree with the arm-current tree
Date: Tue, 12 Oct 2010 09:28:14 +0100 [thread overview]
Message-ID: <20101012082814.GC12845@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20101012080354.GC29673@pengutronix.de>
On Tue, Oct 12, 2010 at 10:03:54AM +0200, Uwe Kleine-König wrote:
> On Tue, Oct 12, 2010 at 10:33:14AM +1100, Stephen Rothwell wrote:
> > Hi Russell,
> >
> > Today's linux-next merge of the arm tree got a conflict in
> > arch/arm/mach-imx/mach-cpuimx27.c between commit
> > 4793ca4028e4dcdbf2740db50995c9378ded3cf8 ("cpuimx27: fix i2c bus
> > selection") from the arm-current tree and commit
> > 77a406da5a5b76445a816d5f043fc9aef4026ff1 ("ARM: imx: fix name of macros
> > to add imx-i2c devices") from the arm tree.
> >
> > I fixed it up (see below) can can carry the fix for a while.
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
> >
> > diff --cc arch/arm/mach-imx/mach-cpuimx27.c
> > index 6830afd,28f73a1..0000000
> > --- a/arch/arm/mach-imx/mach-cpuimx27.c
> > +++ b/arch/arm/mach-imx/mach-cpuimx27.c
> > @@@ -259,8 -258,9 +258,9 @@@ static void __init eukrea_cpuimx27_init
> > i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
> > ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
> >
> > - imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
> > - imx27_add_imx_i2c(1, &cpuimx27_i2c1_data);
> > ++ imx27_add_imx_i2c(0, &cpuimx27_i2c1_data);
> >
> > + imx27_add_fec(NULL);
> > platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
> >
> > #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2)
> >
> This is resolved correctly.
A more concerning question is - these recent conflicts have been happening
as a result of merging people's GIT trees, which tend to be sent close
to the merge window.
If the first time their changes become visible to linux-next is when
they're merged into my tree, something is wrong...
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2010-10-12 8:28 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-11 23:33 linux-next: manual merge of the arm tree with the arm-current tree Stephen Rothwell
2010-10-12 8:03 ` Uwe Kleine-König
2010-10-12 8:28 ` Russell King [this message]
2010-10-12 9:23 ` Uwe Kleine-König
2010-10-12 9:42 ` Russell King
2010-10-12 10:02 ` Uwe Kleine-König
2010-10-12 10:35 ` Sascha Hauer
-- strict thread matches above, loose matches on Subject: below --
2010-12-14 23:54 Stephen Rothwell
2010-12-14 23:57 ` Russell King
2010-12-15 12:28 ` Dave Martin
2010-12-15 16:43 ` Russell King
2010-12-05 23:58 Stephen Rothwell
2010-10-11 1:24 Stephen Rothwell
2010-10-11 7:48 ` Anders Larsen
2010-09-27 4:21 Stephen Rothwell
2010-07-26 1:13 Stephen Rothwell
2010-02-02 0:07 Stephen Rothwell
2010-01-17 23:35 Stephen Rothwell
2010-01-18 1:33 ` Ben Dooks
2010-01-18 3:34 ` Stephen Rothwell
2009-05-06 1:32 Stephen Rothwell
2009-03-23 0:06 Stephen Rothwell
2009-02-15 23:39 Stephen Rothwell
2009-02-16 0:18 ` Ryan Mallon
2009-02-16 0:29 ` Russell King
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=20101012082814.GC12845@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=eric@eukrea.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sfr@canb.auug.org.au \
--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;
as well as URLs for NNTP newsgroup(s).