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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the tty tree with the jc_docs tree
Date	2016-11-08 06:40 +0100
Message-ID	<sB7ix-5a0-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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:

  b9c8b7fc252c ("vgacon: remove prehistoric macros")

from the tty tree.

I fixed it up (I deleted it - since 9d85025b0418 moved it - but that
means it may need fixing up in its new location to match any relevant
changes in b9c8b7fc252c) and can carry the fix as necessary. This is
now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your
tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

Thread

linux-next: manual merge of the tty tree with the jc_docs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-08 06:40 +0100
  Re: linux-next: manual merge of the tty tree with the jc_docs tree Greg KH <greg@kroah.com> - 2016-11-08 11:20 +0100
    Re: linux-next: manual merge of the tty tree with the jc_docs tree Jiri Slaby <jslaby@suse.cz> - 2016-11-08 19:50 +0100
      Re: linux-next: manual merge of the tty tree with the jc_docs tree Greg KH <greg@kroah.com> - 2016-11-08 21:00 +0100

csiph-web