Re: linux-next: manual merge of the jc_docs tree with the arm-perf tree

From: Jonathan Corbet
Date: Tue Nov 05 2019 - 14:13:50 EST


On Tue, 5 Nov 2019 18:11:38 +0000
Will Deacon <will@xxxxxxxxxx> wrote:

> Looks fine to me, thanks. Jon -- are you ok living with this conflict?

Just another day in the life of the docs tree...:) No worries here.
Thanks, Stephen.

jon