Subject: Re: linux-next: manual merge of the ttydev tree

From: Alan Cox <[email-masked]>
Date: Tue, 1 Jul 2008 15:12:05 +0100

On Wed, 2 Jul 2008 00:07:12 +1000
Stephen Rothwell <[email-masked]> wrote:

> Hi ,
> 
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/net/wireless/strip.c between commit
> 94d9842403f770239a656586442454b7a8f2df29 ("remove the strip driver") from
> the net tree and commit 7636d4eb65deca18568e3ec4bfa65b85078042ce
> ("01-ldisc-ref") from the ttydev tree.
> 
> The former removed the file.

Perhaps whoever removed the file would care to talk to the tty driver
maintainer before doing so - please drop the strip driver removal. It
still has a couple of users