Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: [PATCH] ARM: LPC32xx: Provide DMA filter callbacks via platform data | Date | Fri, 17 Aug 2012 11:40:50 +0000 |
| |
On Friday 17 August 2012, Artem Bityutskiy wrote: > Show Details > On Fri, 2012-08-17 at 14:01 +0300, Artem Bityutskiy wrote: > > > To later avoid collisions on subsystem merge, can you please leave the > > > patch with arch/arm/mach-lpc32xx/phy3250.c for arm-soc.git? (I will > > > provide a pull request for Arnd and Olof, as usual.) > > > > Only if Arnd insists. Otherwise I'd prefer to resolve collisions (they > > cannot be hard with this patch) than pulling the soc tree to the mtd > > tree. > > Actually the mtd patches do not compile-depend on it, sorry, I am > dropping it from the MTD tree. Thanks!
For reference, I'm fine with either outcome, I don't mind seeing an occasional collision with subsystem trees, as they tend to be trivial to resolve.
If you split a series to go through multiple git trees, you have to ensure that both halves are actually regression free by themselves, which typically ends up being much harder than fixing a small merge conflict.
Arnd
| |