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

2016-09-29 Thread Greg KH
On Fri, Sep 30, 2016 at 01:38:22PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got conflicts in: > > arch/arm64/Kconfig > > between commit: > > 1d8f51d41fc7 ("arm/arm64: arch_timer: Use archdata to indicate vdso > suitability") > > from the

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

2016-09-29 Thread Greg KH
On Fri, Sep 30, 2016 at 01:38:22PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got conflicts in: > > arch/arm64/Kconfig > > between commit: > > 1d8f51d41fc7 ("arm/arm64: arch_timer: Use archdata to indicate vdso > suitability") > > from the

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

2016-09-29 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the tty tree got conflicts in: arch/arm64/Kconfig between commit: 1d8f51d41fc7 ("arm/arm64: arch_timer: Use archdata to indicate vdso suitability") from the arm64 tree and commit: 888125a71298 ("ARM64: ACPI: enable ACPI_SPCR_TABLE") from the tty

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

2016-09-29 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the tty tree got conflicts in: arch/arm64/Kconfig between commit: 1d8f51d41fc7 ("arm/arm64: arch_timer: Use archdata to indicate vdso suitability") from the arm64 tree and commit: 888125a71298 ("ARM64: ACPI: enable ACPI_SPCR_TABLE") from the tty