Merge remote-tracking branch 'pinctrl/for-next'

# Conflicts:
#	include/linux/pinctrl/pinconf-generic.h

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/pinctrl/pinconf-generic.h
index 5a96602a331609dd7e8695bafd90fca77204e25e,98ed5959ca9ac1203b724404c04e9e182ffb515f..eee0e3948537f84cfd00c84b8d31b9c2b94f3fd7
--- 1/include/linux/pinctrl/pinconf-generic.h
--- 2/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@@ -81,6 -81,10 +81,10 @@@ struct pinctrl_map
   *    passed in the argument on a custom form, else just use argument 1
   *    to indicate low power mode, argument 0 turns low power mode off.
   * @PIN_CONFIG_MODE_PWM: this will configure the pin for PWM
 - *    indicate low level. (Please see Documentation/driver-api/pinctl.rst,
+  * @PIN_CONFIG_OUTPUT: this will configure the pin as an output and drive a
+  *    value on the line. Use argument 1 to indicate high level, argument 0 to
++ *    indicate low level. (Please see Documentation/driver-api/pin-control.rst,
+  *    section "GPIO mode pitfalls" for a discussion around this parameter.)
   * @PIN_CONFIG_OUTPUT_ENABLE: this will enable the pin's output mode
   *    without driving a value there. For most platforms this reduces to
   *    enable the output buffers and then let the pin controller current