{"thread":{"id":"24315","subject":"Re: [FAILED] BLD phyCORE-i.MX35 + linux-next git kernel","startedAt":"2010-07-07T06:47:35Z","lastAt":"2010-07-07T07:15:47Z","messageCount":2,"participants":["Uwe Kleine-König","Stephen Rothwell"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"145004","messageId":"20100707064735.GE2502@pengutronix.de","threadId":"24315","inReplyTo":"20100707114858.e52cec1b.sfr@canb.auug.org.au","subject":"Re: [FAILED] BLD phyCORE-i.MX35 + linux-next git kernel","fromName":"Uwe Kleine-König","fromEmail":"u.kleine-koenig@pengutronix.de","sentAt":"2010-07-07T06:47:35Z","receivedAt":"2010-07-07T06:47:35Z","isPatch":false,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"Hi,\n\nOn Wed, Jul 07, 2010 at 11:48:58AM +1000, Stephen Rothwell wrote:\n> Hi Uwe,\n> \n> On Tue, 6 Jul 2010 17:22:46 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:\n> >\n> > our -next autobuilder barfs:\n> > \n> > On Mon, Jul 05, 2010 at 11:10:37PM +0200, Pengutronix Sisyphus Druid wrote:\n> > > ...\n> > >                               Source URL .... git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git\n> > >                         Current git hash .... 288092896e2097eebee7d4bf1df9a0c7b550e225\n> > >                     Kernel configuration .... use config: mx3_defconfig\n> > >                             Kernel build .... [FAILED]\n> > > ...\n> > >   CC      arch/arm/mm/fault-armv.o\n> > >   CC      arch/arm/mm/flush.o\n> > >   CC      arch/arm/mach-mx3/clock-imx35.o\n> > >   CC      arch/arm/mach-mx3/mach-mx31ads.o\n> > >   CC      arch/arm/mach-mx3/mach-mx31lilly.o\n> > >   CC      arch/arm/kernel/armksyms.o\n> > >   CC      arch/arm/mm/ioremap.o\n> > > arch/arm/mach-mx3/mach-mx31lilly.c:300: error: redefinition of 'devices'\n> > > arch/arm/mach-mx3/mach-mx31lilly.c:295: error: previous definition of 'devices' was here\n> > \n> > The problem is a mis-merge of i..MX/for-next as it contains a patch\n> > c0d1dac4a91a665fb5b5f1674acf57dc8cdc07ec that is already in Linus' tree\n> > as 4d5d85906ad109987504033fa04991f1b0a2e552:\n> \n> OK, this is only the third time I have seen git mismerge something\n> automaitcally. :-(\nI can reproduce that here[1].  Is this a bug in git?  Can somebody explain?\nI expected a merge conflict or only a single occurence of devices[]\n\n> > Stephen: The obvious fix is to remove one of the two identical devices[].\n> \n> I have fixed this up in today's linux-next (and will continue to do so\n> while necessary).\nHow do you remember this.  By \"hand\" or do you have some automatism for\nsuch things?\n\nBest regards and thanks\nUwe\n\n[1] \n\tgit clone -n git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git\n\tcd linux-next\n\tgit checkout 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78\n\tgit merge c8adc84533d7e98487b77154eedf2eaf0ed6037e\n\tgrep devices[[] arch/arm/mach-mx3/mach-mx31lilly.c\n\t\n\n-- \nPengutronix e.K.                           | Uwe Kleine-König            |\nIndustrial Linux Solutions                 | http://www.pengutronix.de/  |\n"},{"id":"145005","messageId":"20100707171547.822511cd.sfr@canb.auug.org.au","threadId":"24315","inReplyTo":"20100707064735.GE2502@pengutronix.de","subject":"Re: [FAILED] BLD phyCORE-i.MX35 + linux-next git kernel","fromName":"Stephen Rothwell","fromEmail":"sfr@canb.auug.org.au","sentAt":"2010-07-07T07:15:47Z","receivedAt":"2010-07-07T07:15:47Z","isPatch":false,"sender":{"key":"sfr@canb.auug.org.au","avatar":null},"body":"Hi Uwe,\n\nOn Wed, 7 Jul 2010 08:47:35 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:\n>\n> > OK, this is only the third time I have seen git mismerge something\n> > automaitcally. :-(\n> I can reproduce that here[1].  Is this a bug in git?  Can somebody explain?\n> I expected a merge conflict or only a single occurence of devices[]\n\nI suspect it is a matter of not enough context (or the context looks the\nsame after applying one of the updates) for git to realise that both\ntrees are trying to add the same code in the same place.  There is a\nconflict, but the recursive merge decides that each tree is adding\nsomething different and so include them both (or some such :-)).  Most of\nthe time, git gets this right.\n\n> > I have fixed this up in today's linux-next (and will continue to do so\n> > while necessary).\n> How do you remember this.  By \"hand\" or do you have some automatism for\n> such things?\n\nIn this case, my scripts automatically apply a patch to the merge commit.\n\n-- \nCheers,\nStephen Rothwell                    sfr@canb.auug.org.au\nhttp://www.canb.auug.org.au/~sfr/\n"}]}