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

On Tue, Nov 08, 2016 at 07:40:53PM +0100, Jiri Slaby wrote: > On 11/08/2016, 11:15 AM, Greg KH wrote: > > On Tue, Nov 08, 2016 at 04:30:13PM +1100, Stephen Rothwell wrote: > >> Hi Greg, > >> > >> Today's linux-next merge of the tty tree got a conflict in: > >> > >> Documentation/VGA-softcursor.tx

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

On 11/08/2016, 11:15 AM, Greg KH wrote: > On Tue, Nov 08, 2016 at 04:30:13PM +1100, Stephen Rothwell wrote: >> Hi Greg, >> >> Today's linux-next merge of the tty tree got a conflict in: >> >> Documentation/VGA-softcursor.txt >> >> between commits: >> >> 27641b953c54 ("Documentation/VGA-softcurs

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

On Tue, Nov 08, 2016 at 04:30:13PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in: > > Documentation/VGA-softcursor.txt > > between commits: > > 27641b953c54 ("Documentation/VGA-softcursor.txt: convert to ReST markup") > 9d85025b04

linux-next: manual merge of the tty tree with the jc_docs tree

Hi Greg, Today's linux-next merge of the tty tree got a conflict in: Documentation/VGA-softcursor.txt between commits: 27641b953c54 ("Documentation/VGA-softcursor.txt: convert to ReST markup") 9d85025b0418 ("docs-rst: create an user's manual book") from the jc_docs tree and commit: b9