{"thread":{"id":"28962","subject":"[WISH] git-rerere handling delete/modify conflicts [Was: Re: [GIT PULL] ARM irqchip consolidation]","startedAt":"2011-11-17T19:07:42Z","lastAt":"2011-11-17T19:07:42Z","messageCount":1,"participants":["Uwe Kleine-König"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"179645","messageId":"20111117190742.GV30612@pengutronix.de","threadId":"28962","inReplyTo":"20111117172319.GX9581@n2100.arm.linux.org.uk","subject":"[WISH] git-rerere handling delete/modify conflicts [Was: Re: [GIT PULL] ARM irqchip consolidation]","fromName":"Uwe Kleine-König","fromEmail":"u.kleine-koenig@pengutronix.de","sentAt":"2011-11-17T19:07:42Z","receivedAt":"2011-11-17T19:07:42Z","isPatch":false,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"On Thu, Nov 17, 2011 at 05:23:19PM +0000, Russell King - ARM Linux wrote:\n> On Wed, Nov 16, 2011 at 11:23:48AM +0000, Marc Zyngier wrote:\n> > I've collected patches converting GIC and VIC based platforms to use the\n> > MULTI_IRQ_HANDLER configuration option in a single branch (as they depend\n> > on a common patch).\n> > \n> > It also include the patch adding non-banked support to the GIC, which is\n> > required to convert EXYNOS to MULTI_IRQ_HANDLER in a sane way (not to\n> > mention fixing obvious bugs).\n> > \n> > If you're happy with this, feel free to pull this branch.\n> \n> We need to sort out the conflicts between this and the arch_reset stuff\n> I'm carrying, because I'm not going to fight git from this early in the\n> cycle, dealing with stuff like this:\n> \n> CONFLICT (delete/modify): arch/arm/mach-omap2/include/mach/omap4-common.h deleted in HEAD and modified in devel-stable. Version devel-stable of arch/arm/mach-omap2/include/mach/omap4-common.h left in tree.\n> \n> which is immune to git rerere, and I'm sure as hell not going to keep on\n> merging this with my for-next branch.\n> \n> Even though I've split out the conflicting cleanup commits from the\n> arch_reset() stuff, many of them still don't have acked-bys from the\n> maintainers of the affected code, so I don't feel like I can commit\n> them to being stable.\n> \n> What we need are more responsive platform maintainers!\nand git rerere handling delete/modify conflicts. I don't know how it\nworks internally, but I guess it's not trivial? Just in case it is and\nthe only thing that stops you implementing it is that you don't know\nthere is a need for it: voilà.\n\nThanks\nUwe\n\n-- \nPengutronix e.K.                           | Uwe Kleine-König            |\nIndustrial Linux Solutions                 | http://www.pengutronix.de/  |\n"}]}