Merge 4.12-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Jun 2017 07:27:05 +0000 (09:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Jun 2017 07:27:05 +0000 (09:27 +0200)
commit8bc39bca5e3e8da0d62f7f4d67fdbeecab02b350
treeac5df85133c64167381acb33086e154724148dc2
parent094094a9373fbea80ec00714eed5c24f6fd39ecf
parent3c2993b8c6143d8a5793746a54eba8f86f95240f
Merge 4.12-rc4 into tty-next

We want the tty locking fix in here, so that maybe we can finally get it
fixed for real...

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>