linux-next: manual merge of the gpio tree with the pinctrl tree

From: Stephen Rothwell
Date: Mon Sep 12 2016 - 23:16:20 EST

Hi Linus,

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


between commit:

e188cbf7564f ("gpio: mxc: shift gpio_mxc_init() to subsys_initcall level")

from the pinctrl tree and commit:

2c8d6c869feb ("gpio: mxc: drop unused MODULE_ tags from non-modular code")

from the gpio 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.

Stephen Rothwell

diff --cc drivers/gpio/gpio-mxc.c
index e38989a4fa0c,e35af5249478..000000000000
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@@ -515,10 -510,4 +515,4 @@@ static int __init gpio_mxc_init(void
return platform_driver_register(&mxc_gpio_driver);
- MODULE_AUTHOR("Freescale Semiconductor, "
- "Daniel Mack <>, "
- "Juergen Beisert <kernel@xxxxxxxxxxxxxx>");