Re: linux-next: manual merge of the staging tree with the vfs tree

[Greg KH]

On Tue, Oct 09, 2018 at 03:59:45PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/dgnc/dgnc_tty.c
> 
> between commits:
> 
>   b68166ef8fd9 ("dgnc: leave TIOC[GS]SOFTCAR to ldisc")
>   e002c6f1ccb9 ("dgnc: don't bother with (empty) stub for TCXONC")
>   79273fc94ee9 ("dgnc: break-related ioctls won't reach ->ioctl()")
>   246d394c9cc5 ("dgnc: TIOCM... won't reach ->ioctl()")
> 
> from the vfs tree and commit:
> 
>   3268357865d6 ("staging: dgnc: delete the driver")
> 
> from the staging tree.
> 
> I fixed it up (I just removed the file) and can carry the fix as
> necessary.

Removing the file is correct, thanks.

greg k-h