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)
commit69c444ba93b76f2da4f23449c72e83521142b243
tree4d460a117b909ed5d38cf01e00b95f01b4bbb68c
parent2b022ab7542df60021ab57854b3faaaf42552eaf
parent30a7acd573899fd8b8ac39236eff6468b195ac7d
Merge 4.15-rc6 into tty-next

We want the ldisc fix here as well.

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