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

From: Jonathan Corbet <[email-masked]>
Date: Tue, 5 Nov 2019 12:13:45 -0700

On Tue, 5 Nov 2019 18:11:38 +0000
Will Deacon <[email-masked]> 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