Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1322812 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  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

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

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

[toc] | [next] | [standalone]

#1322815

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:
> 
>   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).

Thanks for this, that's the obviously correct fix.

greg k-h

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web