From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: bad merge in the jc_docs tree
Date: Fri, 28 Oct 2016 10:30:29 +1100
Message-ID: <20161028103029.1e147f3e@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: Jonathan Corbet <corbet@lwn.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: linux-next.vger.kernel.org

Hi Jon,

I noticed that you left some conflict markers in
Documentation/admin-guide/index.rst in merge commit

  7a6992dc952e ("Merge branch 'doc-tweaks' into docs-next")

-- 
Cheers,
Stephen Rothwell