linux-next: bad merge in the jc_docs tree

From: Stephen Rothwell
Date: Thu Oct 27 2016 - 19:30:41 EST

Next message: Simon Wood: "Re: [RFC] HID:hid-lg4ff: Delay to allow wheels to center after plug-in"
Previous message: Linus Torvalds: "Re: [PULL] modules: begin maintainer transition"
Next in thread: Jonathan Corbet: "Re: linux-next: bad merge in the jc_docs tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

Next message: Simon Wood: "Re: [RFC] HID:hid-lg4ff: Delay to allow wheels to center after plug-in"
Previous message: Linus Torvalds: "Re: [PULL] modules: begin maintainer transition"
Next in thread: Jonathan Corbet: "Re: linux-next: bad merge in the jc_docs tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]