From patchwork Fri May 3 00:52:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 2514731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 3103C3FD85 for ; Fri, 3 May 2013 00:53:39 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY4Fd-000192-Gw; Fri, 03 May 2013 00:53:29 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY4Fa-0005C8-Sl; Fri, 03 May 2013 00:53:26 +0000 Received: from haggis.tip.net.au ([2402:b800:7003:1::20] helo=members.tip.net.au) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UY4FW-0005BV-Jt for linux-arm-kernel@lists.infradead.org; Fri, 03 May 2013 00:53:24 +0000 Received: from canb.auug.org.au (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by members.tip.net.au (Postfix) with ESMTPSA id 523C2164061; Fri, 3 May 2013 10:52:43 +1000 (EST) Date: Fri, 3 May 2013 10:52:34 +1000 From: Stephen Rothwell To: Grant Likely Subject: Re: [GIT PULL] Removal of GENERIC_GPIO Message-Id: <20130503105234.6e9c8aa5ed2784bbe084caa8@canb.auug.org.au> In-Reply-To: <51823DDA.7010103@nvidia.com> References: <51823DDA.7010103@nvidia.com> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_205323_325239_29B570EC X-CRM114-Status: GOOD ( 29.66 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: "linux-arch@vger.kernel.org" , Alexandre Courbot , Linus Walleij , "linux-kernel@vger.kernel.org" , Alex Courbot , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi Grant, On Thu, 2 May 2013 19:20:10 +0900 Alex Courbot wrote: > > Here is the pull request for the GENERIC_GPIO removal. It is almost > certain that a few fixups will be necessary - while I don't have precise > patches, the following steps should ensure the state of the code is clean: > > * "git grep CONFIG_GENERIC_GPIO" should return 0 hits. Matches should be > replaced with CONFIG_GPIOLIB > * "git grep '\bGENERIC_GPIO\b'" should return 1 hit in the Chinese > documentation. Selectors of GENERIC_GPIO should be turned into selectors > of GPIOLIB, while definitions of the option in architecture code should > be deleted. > > Please let me know if there is something more I can do to ease your task. > > Thanks, > Alex. > > The following changes since commit 10b38669d64c757cfd927e3820292c580ed70aae: > > Merge tag 'for-linus-v3.9-rc4' of git://oss.sgi.com/xfs/xfs > (2013-03-19 15:17:40 -0700) > > are available in the git repository at: > > git://github.com/Gnurou/linux.git for_grant > > for you to fetch changes up to f4c54050640e7afa4749875cf9b900d42db361c0: > > gpio: update gpio Chinese documentation (2013-04-16 18:47:22 +0900) I currently have 3 merge fix patches for the gen-cpio tree: gen-gpio: GPIOLIB merge fix up merge fix for Convert selectors of GENERIC_GPIO to GPIOLIB merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOLIB I have attached them. All three are now applicable to Linus' tree. From fca3f55cd845c7640ef80e85a169fa7225bfd8ed Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 18 Apr 2013 17:08:14 +1000 Subject: [PATCH] merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOLIB Signed-off-by: Stephen Rothwell --- drivers/i2c/muxes/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig index b5329b0..f7f9865 100644 --- a/drivers/i2c/muxes/Kconfig +++ b/drivers/i2c/muxes/Kconfig @@ -7,7 +7,7 @@ menu "Multiplexer I2C Chip support" config I2C_ARB_GPIO_CHALLENGE tristate "GPIO-based I2C arbitration" - depends on GENERIC_GPIO && OF + depends on GPIOLIB && OF help If you say yes to this option, support will be included for an I2C multimaster arbitration scheme using GPIOs and a challenge & -- 1.8.1