linux-next: bad merge in the jc_docs tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: bad merge in the jc_docs tree
Date	2016-10-28 01:40 +0200
Message-ID	<sx2r7-9r-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: bad merge in the jc_docs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-28 01:40 +0200
  Re: linux-next: bad merge in the jc_docs tree Jonathan Corbet <corbet@lwn.net> - 2016-10-28 02:00 +0200

csiph-web