Re: linux-next: manual merge of the staging tree with the tty tree
From: Greg KH
Date: Sun Jan 31 2016 - 23:02:37 EST
On Mon, Feb 01, 2016 at 02:51:46PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging tree got a conflict in:
> 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).
Thanks for this, that's the obviously correct fix.