From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759388Ab1EMOvT (ORCPT ); Fri, 13 May 2011 10:51:19 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:37598 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756573Ab1EMOvR convert rfc822-to-8bit (ORCPT ); Fri, 13 May 2011 10:51:17 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=R6rFNuFusv2CY3UX7a/zWfDAIDlSbuGgDnPmlxW1r7MMlqMTXwX4FStK/kS0N7MbLB 2iPKlUuOgY5JXi5AdJF/n3bGjXuhQZSi0G5gIAqRW9bK1u4DTslTMmlvRAnOkbwGrABc h5pNjjOVeZjJsN/zddCtrpWu4CE67+KgeNf7I= MIME-Version: 1.0 In-Reply-To: <0D753D10438DA54287A00B027084269764D26C443E@AUSP01VMBX24.collaborationhost.net> References: <1303910002-3333-1-git-send-email-linus.walleij@stericsson.com> <0D753D10438DA54287A00B027084269764D2650215@AUSP01VMBX24.collaborationhost.net> <0D753D10438DA54287A00B027084269764D26C443E@AUSP01VMBX24.collaborationhost.net> Date: Fri, 13 May 2011 16:51:17 +0200 X-Google-Sender-Auth: VO9l7J5ojxhnFxrlXEJtxp84Tc8 Message-ID: Subject: Re: [PATCH 02/10] mach-u300: rewrite gpio driver, move to drivers/gpio From: Linus Walleij To: H Hartley Sweeten Cc: Grant Likely , Jonas Aaberg , Lee Jones , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2011/4/28 H Hartley Sweeten : > On Thursday, April 28, 2011 12:08 AM, Linus Walleij wrote: >> 2011/4/27 H Hartley Sweeten : >>> The Makefile should probably be reordered, either alphabetically >>> or grouped by type (arch/mmio/i2c/spi/pci/etc) and then >>> alphabetically in order to reduce merge conflicts. >> >> Yes, but if I do that in my patchset I will screw up Grants GPIO tree >> completely, so I prefer that Grant do this. And maybe after pulling >> in my GPIO consolidation tree to his in that case, so we don't get >> undesired collisions. So leaving this for the GPIO maintainer. > > This comment was intended for the GPIO maintainer.  Sorry for any > confusion. Nop problem, I actually made a fix for it that I think Grant can take in for 2.6.40. Yours, Linus Walleij From mboxrd@z Thu Jan 1 00:00:00 1970 From: linus.walleij@linaro.org (Linus Walleij) Date: Fri, 13 May 2011 16:51:17 +0200 Subject: [PATCH 02/10] mach-u300: rewrite gpio driver, move to drivers/gpio In-Reply-To: <0D753D10438DA54287A00B027084269764D26C443E@AUSP01VMBX24.collaborationhost.net> References: <1303910002-3333-1-git-send-email-linus.walleij@stericsson.com> <0D753D10438DA54287A00B027084269764D2650215@AUSP01VMBX24.collaborationhost.net> <0D753D10438DA54287A00B027084269764D26C443E@AUSP01VMBX24.collaborationhost.net> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 2011/4/28 H Hartley Sweeten : > On Thursday, April 28, 2011 12:08 AM, Linus Walleij wrote: >> 2011/4/27 H Hartley Sweeten : >>> The Makefile should probably be reordered, either alphabetically >>> or grouped by type (arch/mmio/i2c/spi/pci/etc) and then >>> alphabetically in order to reduce merge conflicts. >> >> Yes, but if I do that in my patchset I will screw up Grants GPIO tree >> completely, so I prefer that Grant do this. And maybe after pulling >> in my GPIO consolidation tree to his in that case, so we don't get >> undesired collisions. So leaving this for the GPIO maintainer. > > This comment was intended for the GPIO maintainer. ?Sorry for any > confusion. Nop problem, I actually made a fix for it that I think Grant can take in for 2.6.40. Yours, Linus Walleij