Merge remote-tracking branch 'gpio/gpio/next'

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/gpio/gpio-mxs.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
index 5359ca78130fe09376210395f964770562b70798,4b3f388bcc6d8e47ac8ae3ccb311091b5dfde032..4828fe7c66cb8d356f307698d1206437db19c3e5
--- 1/drivers/gpio/gpiolib.c
--- 2/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@@ -801,12 -819,18 +819,18 @@@ fail_unregister_device
        device_unregister(dev);
  fail_unlock:
        mutex_unlock(&sysfs_lock);
-       pr_debug("%s: gpio%d status %d\n", __func__, gpio, status);
+       pr_debug("%s: gpio%d status %d\n", __func__, desc_to_gpio(desc),
+                status);
        return status;
  }
+ 
+ int gpio_export(unsigned gpio, bool direction_may_change)
+ {
+       return gpiod_export(gpio_to_desc(gpio), direction_may_change);
+ }
  EXPORT_SYMBOL_GPL(gpio_export);
  
 -static int match_export(struct device *dev, void *data)
 +static int match_export(struct device *dev, const void *data)
  {
        return dev_get_drvdata(dev) == data;
  }