Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1570371 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the pinctrl tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-31 06:50 +0100

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

Hi Linus,

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

  arch/arm/mach-exynos/suspend.c

between commit:

  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.

-- 
Cheers,
Stephen Rothwell

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web