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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the staging tree with the tty tree
Date	2017-06-05 07:00 +0200
Message-ID	<tOShs-6GX-3@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 staging tree got a conflict in:

  include/uapi/linux/tty.h

between commit:

  8a8dabf2dd68 ("tty: handle the case where we cannot restore a line discipline")

from the tty tree and commit:

  1ab92da32e37 ("staging: speakup: add tty-based comms functions")

from the staging tree.

I fixed it up (I used the tty tree version) 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 staging tree with the tty tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-05 07:00 +0200
  Re: linux-next: manual merge of the staging tree with the tty tree Greg KH <greg@kroah.com> - 2017-06-05 09:00 +0200

csiph-web