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

On 2020/10/1 20:31, Rob Herring wrote: > On Thu, Oct 1, 2020 at 1:26 AM Krzysztof Kozlowski wrote: >> >> On Thu, 1 Oct 2020 at 08:22, Stephen Rothwell wrote: >>> >>> Hi all, >>> >>> Today's linux-next merge of the devicetree tree got a conflict in: >>> >>>

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

Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/arm/samsung/sysreg.yaml between commit: 18394297562a ("dt-bindings: mfd: syscon: Merge

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

On Thu, Oct 1, 2020 at 1:26 AM Krzysztof Kozlowski wrote: > > On Thu, 1 Oct 2020 at 08:22, Stephen Rothwell wrote: > > > > Hi all, > > > > Today's linux-next merge of the devicetree tree got a conflict in: > > > > Documentation/devicetree/bindings/mfd/syscon.yaml > > > > between commit: > > >

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

On Thu, 1 Oct 2020 at 08:22, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/mfd/syscon.yaml > > between commit: > > 18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg >

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

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/mfd/syscon.yaml between commit: 18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings") 05027df1b94f ("dt-bindings: mfd: syscon: Document Exynos3 and