linux-next: manual merge of the pinctrl tree with the arm-soc tree
From: Stephen Rothwell
Date: Tue Jan 31 2017 - 00:48:31 EST
Today's linux-next merge of the pinctrl tree got a conflict in:
b4765037fc8c ("ARM: EXYNOS: Constify list of retention registers")
from the arm-soc tree and commit:
07731019c59c ("pinctrl: samsung: Move retention control from mach-exynos to the pinctrl driver")
from the pinctrl tree.
I fixed it up (the latter removed the code updated by the former, so I
just did that) 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.