linux-next: manual merge of the gpio-brgl tree with the origin tree

linux-next: manual merge of the gpio-brgl tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

Hi all,

Today's linux-next merge of the gpio-brgl tree got a conflict in:

  drivers/gpio/gpio-by-pinctrl.c

between commit:

  67ff4bf723c8b ("gpio: gpio-by-pinctrl: Apply initial value in direction output wrapper")

from the origin tree and commit:

  408866669ce01 ("gpio: gpio-by-pinctrl: Apply initial value in direction output wrapper")

from the gpio-brgl tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/gpio/gpio-by-pinctrl.c
index fb8440acb31d9,f54efd635f139..0000000000000
--- a/drivers/gpio/gpio-by-pinctrl.c
+++ b/drivers/gpio/gpio-by-pinctrl.c
@@@ -54,11 -54,11 +54,11 @@@ static int pin_control_gpio_direction_o
  {
  	int ret;
  
 -	ret = pin_control_gpio_set(chip, offset, val);
 +	ret = pinctrl_gpio_direction_output(chip, offset);
  	if (ret)
  		return ret;
  
 -	return pinctrl_gpio_direction_output(chip, offset);
 +	return pin_control_gpio_set(chip, offset, val);
  }
  
  static int pin_control_gpio_probe(struct platform_device *pdev)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]