linux-kernel - Re: linux-next: manual merge of the staging tree with the tty 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 for Android: free password hash cracker in your pocket

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

Date:	Sun, 31 Jan 2016 20:01:51 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Hurley <peter@...leysoftware.com>,
	Shraddha Barke <shraddha.6596@...il.com>
Subject: Re: linux-next: manual merge of the staging tree with the tty tree

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