Re: linux-next: manual merge of the pinctrl tree with the devicetree tree

[Ludovic BARRE]

On 07/31/2018 07:42 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pinctrl tree got a conflict in:
>
>    Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
>
> between commit:
>
>    791d3ef2e111 ("dt-bindings: remove 'interrupt-parent' from bindings")
>
> from the devicetree tree and commit:
>
>    de1d08b22974 ("dt-bindings: pinctrl: add syscfg mask parameter")
>
> from the pinctrl 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.

hi Stephen

thanks for the fix conflict, and the fix is OK for me.

BR
Ludo