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

On Tue, Jun 02, 2020 at 03:48:24PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tty tree got a conflict in: > > Documentation/devicetree/bindings/serial/rs485.yaml > > between commit: > > 9f60a65bc5e6 ("dt-bindings: Clean-up schema indentation formatting") >

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

Hi all, Today's linux-next merge of the tty tree got a conflict in: Documentation/devicetree/bindings/serial/rs485.yaml between commit: 9f60a65bc5e6 ("dt-bindings: Clean-up schema indentation formatting") from the devicetree tree and commit: 01c38ecff8b1 ("dt-bindings: serial: Add

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

Hi Greg, Today's linux-next merge of the tty tree got a conflict in Documentation/devicetree/bindings/serial/pl011.txt between commit a81a6c654bbe ("ARM: dt: fix up PL011 device tree bindings") from the devicetree tree and commit 98267d33e2da ("serial: pl011: Add device tree support for RX DMA

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

Hi Greg, Today's linux-next merge of the tty tree got a conflict in Documentation/devicetree/bindings/serial/pl011.txt between commit a81a6c654bbe (ARM: dt: fix up PL011 device tree bindings) from the devicetree tree and commit 98267d33e2da (serial: pl011: Add device tree support for RX DMA

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

On Tue, Aug 13, 2013 at 03:41:06PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in include/linux/of.h > between commit 2adfffa22350 ("OF: make of_property_for_each_{u32|string}() > use parameters if OF is not enabled") from the devicetree

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

On Tue, Aug 13, 2013 at 03:41:06PM +1000, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the tty tree got a conflict in include/linux/of.h between commit 2adfffa22350 (OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled) from the devicetree tree

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

Hi Greg, Today's linux-next merge of the tty tree got a conflict in include/linux/of.h between commit 2adfffa22350 ("OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled") from the devicetree tree and commit 5c19e95216b9 ("OF: Add helper for matching against

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

Hi Greg, Today's linux-next merge of the tty tree got a conflict in include/linux/of.h between commit 2adfffa22350 (OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled) from the devicetree tree and commit 5c19e95216b9 (OF: Add helper for matching against