linux-next: manual merge of the pinctrl tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

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

  drivers/pinctrl/Makefile

between commit:

  d1661439f5a3 ("pinctrl: add a Cirrus ep93xx SoC pin controller")

from the arm-soc tree and commit:

  41795aa1f56a ("pinctrl: eyeq5: add platform driver")

from the pinctrl tree.

I fixed it up (see below - I also sorted the entries) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pinctrl/Makefile
index f28602d95424,3c2355150961..000000000000
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -22,8 -22,8 +22,9 @@@ obj-$(CONFIG_PINCTRL_CY8C95X0)	+= pinct
  obj-$(CONFIG_PINCTRL_DA850_PUPD) += pinctrl-da850-pupd.o
  obj-$(CONFIG_PINCTRL_DA9062)	+= pinctrl-da9062.o
  obj-$(CONFIG_PINCTRL_DIGICOLOR)	+= pinctrl-digicolor.o
- obj-$(CONFIG_PINCTRL_EQUILIBRIUM)   += pinctrl-equilibrium.o
 +obj-$(CONFIG_PINCTRL_EP93XX)	+= pinctrl-ep93xx.o
+ obj-$(CONFIG_PINCTRL_EQUILIBRIUM)   += pinctrl-equilibrium.o
+ obj-$(CONFIG_PINCTRL_EYEQ5)	+= pinctrl-eyeq5.o
  obj-$(CONFIG_PINCTRL_GEMINI)	+= pinctrl-gemini.o
  obj-$(CONFIG_PINCTRL_INGENIC)	+= pinctrl-ingenic.o
  obj-$(CONFIG_PINCTRL_K210)	+= pinctrl-k210.o

Attachment: pgp6IcVjYL74a.pgp
Description: OpenPGP digital signature