From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@arm.linux.org.uk (Russell King - ARM Linux) Date: Sat, 1 Oct 2011 23:39:14 +0100 Subject: [PATCH v2] mach-ep93xx: break out GPIO driver specifics In-Reply-To: References: <1316508132-20020-1-git-send-email-linus.walleij@stericsson.com> <20110920174012.GE7781@ponder.secretlab.ca> Message-ID: <20111001223914.GP11710@n2100.arm.linux.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Sep 20, 2011 at 10:32:13PM +0200, Linus Walleij wrote: > On Tue, Sep 20, 2011 at 7:40 PM, Grant Likely wrote: > > Which tree will this go through? ?I don't think it should go via the > > gpio tree since it is mostly within arch/arm. > > It'd dependent on Russells cleanups so it'll go through Russells > tree and his gpio cleanup branch there. It's dependent on other stuff elsewhere too: error: patch failed: drivers/gpio/gpio-ep93xx.c:24 error: drivers/gpio/gpio-ep93xx.c: patch does not apply According to your patch, line 24 onwards is: #include #include whereas I have this around line 24: #include #include So I've applied this with GNU patch instead, accepting the one line of fuzz: Hunk #1 succeeded at 23 with fuzz 1 (offset -1 lines). As a result, I expect sfr will report a trivial merge conflict here. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752764Ab1JAWjg (ORCPT ); Sat, 1 Oct 2011 18:39:36 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:47574 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751598Ab1JAWj3 (ORCPT ); Sat, 1 Oct 2011 18:39:29 -0400 Date: Sat, 1 Oct 2011 23:39:14 +0100 From: Russell King - ARM Linux To: Linus Walleij Cc: Grant Likely , Linus Walleij , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Hartley Sweeten , Ryan Mallon Subject: Re: [PATCH v2] mach-ep93xx: break out GPIO driver specifics Message-ID: <20111001223914.GP11710@n2100.arm.linux.org.uk> References: <1316508132-20020-1-git-send-email-linus.walleij@stericsson.com> <20110920174012.GE7781@ponder.secretlab.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 20, 2011 at 10:32:13PM +0200, Linus Walleij wrote: > On Tue, Sep 20, 2011 at 7:40 PM, Grant Likely wrote: > > Which tree will this go through?  I don't think it should go via the > > gpio tree since it is mostly within arch/arm. > > It'd dependent on Russells cleanups so it'll go through Russells > tree and his gpio cleanup branch there. It's dependent on other stuff elsewhere too: error: patch failed: drivers/gpio/gpio-ep93xx.c:24 error: drivers/gpio/gpio-ep93xx.c: patch does not apply According to your patch, line 24 onwards is: #include #include whereas I have this around line 24: #include #include So I've applied this with GNU patch instead, accepting the one line of fuzz: Hunk #1 succeeded at 23 with fuzz 1 (offset -1 lines). As a result, I expect sfr will report a trivial merge conflict here.