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

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 devic

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

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: p