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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20181009091851.GB19241@kroah.com>
Date:   Tue, 9 Oct 2018 11:18:52 +0200
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Al Viro <viro@...iv.linux.org.uk>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the vfs tree

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