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

Hi All, On Thu, 15 Mar 2018 17:28:58 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tty tree got conflicts in: > > arch/arm/boot/dts/stih407-b2120.dts > arch/arm/boot/dts/stih410-b2120.dts > arch/arm/boot/dts/stih410-b2260.dts > arch/arm/boot/dts/stih418-b2199.dts >

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

On Thu, Mar 15, 2018 at 05:28:58PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got conflicts in: > > arch/arm/boot/dts/stih407-b2120.dts > arch/arm/boot/dts/stih410-b2120.dts > arch/arm/boot/dts/stih410-b2260.dts > arch/arm/boot/dts/stih418-b2199

linux-next: manual merge of the tty tree with the arm-soc tree

Hi Greg, Today's linux-next merge of the tty tree got conflicts in: arch/arm/boot/dts/stih407-b2120.dts arch/arm/boot/dts/stih410-b2120.dts arch/arm/boot/dts/stih410-b2260.dts arch/arm/boot/dts/stih418-b2199.dts between commit: db5430663017 ("arm: dts: replace 'linux,stdout-path' with

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

Hi all, With the merge window opening, just a reminder that this conflict still exists. On Tue, 20 Jun 2017 13:52:42 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tty tree got a conflict in: > > include/linux/platform_data/atmel.h > > between commit: > > 8a3d809373c6

linux-next: manual merge of the tty tree with the arm-soc tree

Hi Greg, Today's linux-next merge of the tty tree got a conflict in: include/linux/platform_data/atmel.h between commit: 8a3d809373c6 ("ARM: at91: remove atmel_nand_data") from the arm-soc tree and commit: 92c8f7c0e109 ("tty/serial: atmel: make the driver DT only") from the tty tree.