Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760676Ab2EPWWV (ORCPT ); Wed, 16 May 2012 18:22:21 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:48713 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759262Ab2EPWWS (ORCPT ); Wed, 16 May 2012 18:22:18 -0400 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:1b02:1aa9:5ff:fe24:37a9] In-Reply-To: <201205162205.09082.rjw@sisk.pl> References: <20120515154333.6659.66479.sendpatchset@w520> <201205162205.09082.rjw@sisk.pl> Date: Wed, 16 May 2012 15:22:17 -0700 Message-ID: Subject: Re: [PATCH] gpio: Emma Mobile GPIO driver V2 From: Olof Johansson To: "Rafael J. Wysocki" Cc: Linus Walleij , Magnus Damm , linux-kernel@vger.kernel.org, linus.walleij@stericsson.com, arnd@arndb.de, linux-sh@vger.kernel.org, horms@verge.net.au, grant.likely@secretlab.ca, lethal@linux-sh.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1354 Lines: 32 On Wed, May 16, 2012 at 1:05 PM, Rafael J. Wysocki wrote: > On Wednesday, May 16, 2012, Linus Walleij wrote: >> On Wed, May 16, 2012 at 12:15 PM, Magnus Damm 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/