linux-next: manual merge of the gpio-brgl tree with the origin tree
Mark Brown <[email protected]>
| Newsgroups | org.kernel.vger.linux-next,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
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)
signature.asc
(application/pgp-signature, 488 B)
-----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmp8oyYACgkQJNaLcl1U h9AEtgf9FMnPRYP73JQsCcLZcJnFSgzP+lUoZJVbzeqCp8cPWQ2Cv6/YtDoACvyt qKYYk/w72hG2Om1rNynIFXnJqqu2l+UdRDKuRvlZiLCx7ANAi83sA0+h3JPWrbgA tXma6CC+APP4rAvo2bcb250bTAtNcSltsSmXcCwApflSq1PoXNScfOMPNZggzaSE eoaR3sJ61UA+J4cRnvlmKF9ULCeUYsAqliejxSBn2LGWTwjg5ZCyqLePPYyK6hea NOAyHkGsYQKQk1mHhdqkiTZxDnM1QvM/6+s5/5lYBvn11ichwaPulK16WnaOJCRr zRE1XmBCa/OJqH9LoSbNYGB/PWEtfQ== =Qh8W -----END PGP SIGNATURE-----