On Tue, Oct 12, 2010 at 11:23:57AM +0200, Uwe Kleine-König wrote:
> Hi Russell,
>
> On Tue, Oct 12, 2010 at 09:28:14AM +0100, Russell King wrote:
> > 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.
> > 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...
> I tried to reconstruct that. I guess I cannot see yet that Russell took
> 4793ca4028e4dcdbf2740db50995c9378ded3cf8 because I have no access to
> Russell's kernel.org repo and his ftp.arm.linux.org.uk repo currently
> barfs for me and Stephen didn't push out a tree newer than 20101011 yet.
What's up with it? What URL are you using?
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
