Messages in this thread | | | Date | Wed, 16 May 2012 15:22:17 -0700 | Subject | Re: [PATCH] gpio: Emma Mobile GPIO driver V2 | From | Olof Johansson <> |
| |
On Wed, May 16, 2012 at 1:05 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > On Wednesday, May 16, 2012, Linus Walleij wrote: >> On Wed, May 16, 2012 at 12:15 PM, Magnus Damm <magnus.damm@gmail.com> wrote: >> >> > Do you guys have any preferences how to merge this? >> > >> > Can I include it together with the EMEV2 SoC bits perhaps? That may be >> > easy so we can keep track of the platform data header file dependency. >> >> For ux500 I made a special "gpio and pins" branch and sent through ARM SoC. > > The problem is we have a patch depending on the $subject one in the EMEV2 > series and it would be better to keep them both together if that's not > a big deal.
Dependencies are fine, as long as they are not circular. You can either pull in the gpio/pins branch into the EMEV2 branch, or base it on it.
While we try to keep most dependencies one-way and common between platforms, as long as the combinations don't grow exponentially we can deal with a couple of reverse ones by adding a new version of the topic branch further down the list of merges to do (see dt2 or soc2 in arm-soc today).
-Olof
| |