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

Hi Stephen, On Tue, May 26, 2020 at 7:20 AM Stephen Rothwell wrote: > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/watchdog/renesas,wdt.txt > > between commit: > > ff1ee6fb276c ("dt-bindings: watchdog: renesas,wdt: Document r8a7742

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

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/watchdog/renesas,wdt.txt between commit: ff1ee6fb276c ("dt-bindings: watchdog: renesas,wdt: Document r8a7742 support") from the watchdog tree and commit: d0941cfb9fa8 ("dt-bindin