[GIT,PULL] Removal of GENERIC_GPIO

Commit Message

Stephen Rothwell May 3, 2013, 12:52 a.m. UTC

Hi Grant,

On Thu, 2 May 2013 19:20:10 +0900 Alex Courbot <[e-mail]> 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.

Comments

Stephen Rothwell May 3, 2013, 1:03 a.m. UTC | #1

Hi Guys,

On Fri, 3 May 2013 10:52:34 +1000 Stephen Rothwell <[e-mail]> wrote:
>
> 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.

Just to absolutely clear, I *do not* expect either of you to rebase your
trees or backmerge Linus' tree to fix these, I *do* expect whoever send
this stuff to Linus to mention the necessary fixes to him.

Grant Likely May 3, 2013, 6:53 a.m. UTC | #2

On Fri, May 3, 2013 at 2:03 AM, Stephen Rothwell <[e-mail]> wrote:
> Hi Guys,
>
> On Fri, 3 May 2013 10:52:34 +1000 Stephen Rothwell <[e-mail]> wrote:
>>
>> 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.
>
> Just to absolutely clear, I *do not* expect either of you to rebase your
> trees or backmerge Linus' tree to fix these, I *do* expect whoever send
> this stuff to Linus to mention the necessary fixes to him.

Yes, that is exactly what I'm going to do

g.

Patch

From fca3f55cd845c7640ef80e85a169fa7225bfd8ed Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <[e-mail]>
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 <[e-mail]>
---
 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