Merge 4.15-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 14:10:07 +0000 (15:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 14:10:07 +0000 (15:10 +0100)
We want the ldisc fix here as well.

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

Trivial merge