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	2016-02-01 05:00 +0100
Message-ID	<qXdOF-55d-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:

  drivers/staging/dgap/dgap.c

between commits:

  6aa56785e735 ("staging: digi: Replace open-coded tty_wakeup()")
  2d73b069f816 ("staging: dgap: Remove redundant write_wait wakeups")
  9db276f8f021 ("tty: Use termios c_*flag macros")

from the tty tree and commit:

  7e3933df9874 ("Staging: dgap: Remove obsolete driver")

from the staging tree.

I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).

-- 
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> - 2016-02-01 05:00 +0100
  Re: linux-next: manual merge of the staging tree with the tty tree Greg KH <greg@kroah.com> - 2016-02-01 05:10 +0100

csiph-web